139829 2014-12-19 12:37:32 -0800 copy-webkitlibraries-to-product-directory uses wrong SDK when called from build-webkit 2014-12-19 16:15:21 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Mac All RESOLVED FIXED P2 Normal --- 139831 1 dbates dbates ddkilzer lforschler mrowe simon.fraser oldest_to_newest 1057136 0 dbates 2014-12-19 12:37:32 -0800 The script build-webkit calls copy-webkitlibraries-to-product-directory using --sdk to specify the Xcode SDK to use, but copy-webkitlibraries-to-product-directory only recognizes --sdk-name. The script copy-webkitlibraries-to-product-directory is the only tool that recognizes --sdk-name instead of --sdk. We should make copy-webkitlibraries-to-product-directory consistent with our other tools, remove --sdk-name, and teach it to recognize --sdk. 1057139 1 243565 dbates 2014-12-19 12:42:10 -0800 Created attachment 243565 Patch 1057142 2 243567 dbates 2014-12-19 12:48:48 -0800 Created attachment 243567 Patch 1057186 3 243567 ap 2014-12-19 15:06:09 -0800 Comment on attachment 243567 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=243567&action=review > Tools/Scripts/copy-webkitlibraries-to-product-directory:-76 > - 'sdk-name=s' => \$sdkName, I think that you should also remove this line above: my $sdkName = ""; # Ideally we only use this for build commands, rather than deciding policies about what needs to get copied or built and where it needs to be placed. > Tools/Scripts/copy-webkitlibraries-to-product-directory:103 > +sub ranLib($) This function name lacks a verb. Maybe executeRanlib? Or if there is a more helpful explanation of what this function does, that should be in the name. 1057211 4 dbates 2014-12-19 16:03:49 -0800 (In reply to comment #3) > > Tools/Scripts/copy-webkitlibraries-to-product-directory:-76 > > - 'sdk-name=s' => \$sdkName, > > I think that you should also remove this line above: > > my $sdkName = ""; # Ideally we only use this for build commands, rather than > deciding policies about what needs to get copied or built and where it needs > to be placed. Will remove. > > > Tools/Scripts/copy-webkitlibraries-to-product-directory:103 > > +sub ranLib($) > > This function name lacks a verb. Maybe executeRanlib? Or if there is a more > helpful explanation of what this function does, that should be in the name. Will rename to updateTableOfContentsForLibrary. 1057214 5 dbates 2014-12-19 16:09:05 -0800 (In reply to comment #4) > > > > > Tools/Scripts/copy-webkitlibraries-to-product-directory:103 > > > +sub ranLib($) > > > > This function name lacks a verb. Maybe executeRanlib? Or if there is a more > > helpful explanation of what this function does, that should be in the name. > > Will rename to updateTableOfContentsForLibrary. Actually, there are many references through out this script to ranlib. For now, I'm going to go with your suggestion and rename the function to executeRanlib() for consistency. I suggest we look to update the terminology used in this script in another patch. 1057216 6 dbates 2014-12-19 16:15:21 -0800 Committed r177602: <http://trac.webkit.org/changeset/177602> 243565 2014-12-19 12:42:10 -0800 2014-12-19 12:48:46 -0800 Patch bug-139829-20141219124210.patch text/plain 5317 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3NTYwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZmUzZjkxMzBiMzgyZTQ4ZTUyY2I5ZmVkMGIzZDQ2MGEy MDViMDliNC4uOThkZjVhNmMzNzYzMzg2MGM2NmNkMGE1YmRkYzFhODc3MTA5YTlmOSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMx IEBACisyMDE0LTEyLTE5ICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAg ICAgICBjb3B5LXdlYmtpdGxpYnJhcmllcy10by1wcm9kdWN0LWRpcmVjdG9yeSB1c2VzIHdyb25n IFNESyB3aGVuIGNhbGxlZCBmcm9tIGJ1aWxkLXdlYmtpdAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5ODI5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHNjcmlwdCBidWlsZC13ZWJraXQgY2FsbHMg c2NyaXB0IGNvcHktd2Via2l0bGlicmFyaWVzLXRvLXByb2R1Y3QtZGlyZWN0b3J5IHdpdGgKKyAg ICAgICAgYXJndW1lbnQgLS1zZGsgdG8gc3BlY2lmeSB0aGUgWGNvZGUgU0RLIHRvIHVzZSwgYnV0 IGNvcHktd2Via2l0bGlicmFyaWVzLXRvLXByb2R1Y3QtZGlyZWN0b3J5CisgICAgICAgIGV4cGVj dHMgdGhlIFhjb2RlIFNESyB0byBiZSBzcGVjaWZpZWQgdXNpbmcgdGhlIC0tc2RrLW5hbWUgY29t bWFuZCBsaW5lIGFyZ3VtZW50LgorCisgICAgICAgIEN1cnJlbnRseSBjb3B5LXdlYmtpdGxpYnJh cmllcy10by1wcm9kdWN0LWRpcmVjdG9yeSBoYXMgaXRzIG93biBsb2dpYyB0byBoYW5kbGUKKyAg ICAgICAgcGFyc2luZyBmb3IgYSBzcGVjaWZpZWQgWGNvZGUgU0RLLiBJbnN0ZWFkIHdlIHNob3Vs ZCBtYWtlIHVzZSBvZiB0aGUgd2Via2l0ZGlycy5wbQorICAgICAgICBsb2dpYyB0byBib3RoIGF2 b2lkIGR1cGxpY2F0aW5nIGVmZm9ydCBhbmQgbWFrZSB0aGUgY29tbWFuZCBsaW5lIG9wdGlvbnMg Zm9yCisgICAgICAgIGNvcHktd2Via2l0bGlicmFyaWVzLXRvLXByb2R1Y3QtZGlyZWN0b3J5IGZv ciBzcGVjaWZ5IHRoZSBYY29kZSBTREsgY29uc2lzdGVudAorICAgICAgICB3aXRoIHRoZSBhcHBy b2FjaCB1c2VkIGluIG90aGVyIFdlYktpdCB0b29scy4KKworICAgICAgICBBcyBhIHNpZGUgZWZm ZWN0IG9mIG1ha2luZyB1c2Ugb2YgdGhlIHdlYmtpdGRpcnMucG0gbG9naWMgZm9yIGRldGVybWlu aW5nIHRoZSBYY29kZSBTREsKKyAgICAgICAgY29weS13ZWJraXRsaWJyYXJpZXMtdG8tcHJvZHVj dC1kaXJlY3Rvcnkgbm93IHJlY29nbml6ZXMgLS1kZXZpY2UgYW5kIC0tc2ltdWxhdG9yCisgICAg ICAgIHNob3J0aGFuZHMgZm9yIC0tc2RrPWlwaG9uZW9zLmludGVybmFsIGFuZCAtLXNkaz1pcGhv bmVzaW11bGF0b3IsIHJlc3BlY3RpdmVseS4KKworICAgICAgICAqIFNjcmlwdHMvY29weS13ZWJr aXRsaWJyYXJpZXMtdG8tcHJvZHVjdC1kaXJlY3Rvcnk6CisgICAgICAgIChyYW5MaWIpOiBBZGRl ZDsgY29udmVuaWVuY2UgZnVuY3Rpb24gdGhhdCBjYWxscyB0aGUgUkFOTElCKDEpIHdpdGggdGhl IGFwcHJvcHJpYXRlCisgICAgICAgIFhjb2RlIFNESy4gV2UgcGFzcyAtbm9fd2FybmluZ19mb3Jf bm9fc3ltYm9scyB0byBSQU5MSUIoMSkgd2hlbiB1c2luZyBhbiBYY29kZSBTREsKKyAgICAgICAg Zm9yIGlPUyBzaW5jZSBpdCdzIGFjY2VwdGFibGUgdGhhdCBhbiBlbXB0eSBvYmplY3QgZmlsZSAo c2F5LCBmb3IgYSBNYWMtc3BlY2lmaWMgZmVhdHVyZSkKKyAgICAgICAgYmUgaW5jbHVkZWQgaW4g YSBsaWJyYXJ5LgorICAgICAgICAodW5wYWNrSWZOZWNlc3NhcnkpOiBNb2RpZmllZCB0byBjYWxs IHJhbkxpYigpLgorCiAyMDE0LTEyLTE4ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUu Y29tPgogCiAgICAgICAgIFtXaW5dIFVwZGF0ZSBEdW1wUmVuZGVyVHJlZSB0byBtb3JlIGNsb3Nl bHkgbWF0Y2ggTWFjIHZlcnNpb24KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvY29weS13ZWJr aXRsaWJyYXJpZXMtdG8tcHJvZHVjdC1kaXJlY3RvcnkgYi9Ub29scy9TY3JpcHRzL2NvcHktd2Vi a2l0bGlicmFyaWVzLXRvLXByb2R1Y3QtZGlyZWN0b3J5CmluZGV4IDY4ZmVkNzQ0MWIwYWY0ZWQz OTVhZTg3YmEyYmY3ZTNiZjI5YzYxODcuLjc0MzEyYWMxMGUzODM4ZmJiYmY3YTNhMDkyNDFhNThl ZGYyODJhODkgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvY29weS13ZWJraXRsaWJyYXJpZXMt dG8tcHJvZHVjdC1kaXJlY3RvcnkKKysrIGIvVG9vbHMvU2NyaXB0cy9jb3B5LXdlYmtpdGxpYnJh cmllcy10by1wcm9kdWN0LWRpcmVjdG9yeQpAQCAtNTcsNyArNTcsOSBAQCBVc2FnZTogJHByb2dy YW1OYW1lIFtvcHRpb25zXQogICAtLVtuby1dcHJlZmVyLXN5c3RlbS1sbHZtICAgICBUb2dnbGUg cHJlZmVycmluZyB0aGUgc3lzdGVtIExMVk0gb3ZlciB0aGUgYmluYXJ5IGRyb3BzIChkZWZhdWx0 OiAkcHJlZmVyU3lzdGVtTExWTU92ZXJEcm9wcykKICAgLS1sbHZtLXN1YmRpcmVjdG9yeT08bmFt ZT4gICAgU2V0IHRoZSBuYW1lIG9mIHRoZSBMTFZNIHN1YmRpcmVjdG9yeSB0byBzZWFyY2ggZm9y IChkZWZhdWx0OiAkbGx2bVN1YmRpcmVjdG9yeU5hbWUpCiAgIC0tbGx2bS1wcmVmaXg9PHBhdGg+ ICAgICAgICAgIFNldCB0aGUgcHJlZml4IGludG8gd2hpY2ggTExWTSBpcyBpbnN0YWxsZWQgKGRl ZmF1bHQ6ICRsbHZtUHJlZml4KQotICAtLXNkay1uYW1lPTxuYW1lPiAgICAgICAgICAgICBTZXQg dGhlIG5hbWUgb2YgdGhlIFhjb2RlIFNESyB0byB1c2UuCisgIC0tc2RrPTxzZGs+ICAgICAgICAg ICAgICAgICAgIFVzZSBhIHNwZWNpZmljIFhjb2RlIFNESworICAtLWRldmljZSAgICAgICAgICAg ICAgICAgICAgICBVc2UgdGhlIGN1cnJlbnQgaXBob25lb3MuaW50ZXJuYWwgU0RLIChpT1Mgb25s eSkKKyAgLS1zaW11bGF0b3IgICAgICAgICAgICAgICAgICAgVXNlIHRoZSBjdXJyZW50IGlwaG9u ZXNpbXVsYXRvciBTREsgKGlPUyBvbmx5KQogICAtLW9zeC12ZXJzaW9uPTx2ZXJzaW9uPiAgICAg ICBTZXQgdGhlIE9TIFggdmVyc2lvbiB0byB1c2Ugd2hlbiBkZWNpZGluZyB3aGF0IHRvIGNvcHku CiAgIC0tW25vLV1mb3JjZSAgICAgICAgICAgICAgICAgIFRvZ2dsZSBmb3JjaW5nIHRoZSBjb3B5 IC0gaS5lLiBpZ25vcmluZyB0aW1lc3RhbXBzIChkZWZhdWx0OiAkZm9yY2UpCiBFT0YKQEAgLTcz LDcgKzc1LDYgQEAgR2V0T3B0aW9ucygKICAgICAncHJlZmVyLXN5c3RlbS1sbHZtIScgPT4gXCRw cmVmZXJTeXN0ZW1MTFZNT3ZlckRyb3BzLAogICAgICdsbHZtLXN1YmRpcmVjdG9yeT1zJyA9PiBc JGxsdm1TdWJkaXJlY3RvcnlOYW1lLAogICAgICdsbHZtLXByZWZpeD1zJyA9PiBcJGxsdm1QcmVm aXgsCi0gICAgJ3Nkay1uYW1lPXMnID0+IFwkc2RrTmFtZSwKICAgICAnb3N4LXZlcnNpb249cycg PT4gXCRvc3hWZXJzaW9uLAogICAgICdmb3JjZSEnID0+IFwkZm9yY2UKICk7CkBAIC04Myw2ICs4 NCw4IEBAIGlmICgkc2hvd0hlbHApIHsKICAgIGV4aXQgMTsKIH0KIAorZGV0ZXJtaW5lWGNvZGVT REsoKTsKKwogbXkgJHByb2R1Y3REaXIgPSBzaGlmdCBAQVJHVjsKIGlmICgkcHJvZHVjdERpcikg ewogICAgICRwcm9kdWN0RGlyID0gRmlsZTo6U3BlYy0+cmVsMmFicygkcHJvZHVjdERpcik7CkBA IC05NywxMiArMTAwLDE1IEBAIGlmICghJG9zeFZlcnNpb24pIHsKIAogY2hkaXJXZWJLaXQoKTsK IAotbXkgJHhjcnVuT3B0aW9ucyA9ICIiOwotaWYgKCRzZGtOYW1lIG5lICIiKSB7Ci0gICAgJHhj cnVuT3B0aW9ucyAuPSAiIC1zZGsgJHNka05hbWUiOworc3ViIHJhbkxpYigkKQoreworICAgIG15 ICgkbGlicmFyeSkgPSBAXzsKKyAgICBteSBAYXJnczsKKyAgICBwdXNoIEBhcmdzLCAoIi1zZGsi LCB4Y29kZVNESygpKSBpZiB4Y29kZVNESygpOworICAgIHB1c2ggQGFyZ3MsICJyYW5saWIiOwor ICAgIHB1c2ggQGFyZ3MsICItbm9fd2FybmluZ19mb3Jfbm9fc3ltYm9scyIgaWYgaXNJT1NXZWJL aXQoKTsKKyAgICBzeXN0ZW0oInhjcnVuIiwgQGFyZ3MsICRsaWJyYXJ5KSA9PSAwIG9yIGRpZTsK IH0KLW15ICRyYW5saWIgPSBgeGNydW4gJHhjcnVuT3B0aW9ucyAtZmluZCByYW5saWJgOwotY2hv bXAgJHJhbmxpYjsKIAogc3ViIHVucGFja0lmTmVjZXNzYXJ5CiB7CkBAIC0xMTQsNyArMTIwLDcg QEAgc3ViIHVucGFja0lmTmVjZXNzYXJ5CiAgICAgICAgICAgICBmb3JlYWNoIG15ICRsaWJyYXJ5 IChgdGFyIC10ZiAkcGFja2FnZWApIHsKICAgICAgICAgICAgICAgICBjaG9tcCAkbGlicmFyeTsK ICAgICAgICAgICAgICAgICBwcmludCAiICAgUmFubGliICRsaWJyYXJ5XG4iOwotICAgICAgICAg ICAgICAgIChzeXN0ZW0oJHJhbmxpYiwgJHRhcmdldERpciAuICIvIiAuICRsaWJyYXJ5KSA9PSAw KSBvciBkaWU7CisgICAgICAgICAgICAgICAgcmFuTGliKCR0YXJnZXREaXIgLiAiLyIgLiAkbGli cmFyeSk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuIDE7CkBAIC0x NDksNyArMTU1LDcgQEAgaWYgKCR3a3NpKSB7CiAgICAgICAgIGlmICgkZm9yY2UgfHwgIS1lICRs aWIgfHwgLU0gJGxpYiA+IC1NICRzcmNMaWIpIHsKICAgICAgICAgICAgIHByaW50ICJVcGRhdGlu ZyAkbGliXG4iOwogICAgICAgICAgICAgKHN5c3RlbSgiZGl0dG8iLCAkc3JjTGliLCAkbGliKSA9 PSAwKSBvciBkaWU7Ci0gICAgICAgICAgICAoc3lzdGVtKCRyYW5saWIsICRsaWIpID09IDApIG9y IGRpZTsKKyAgICAgICAgICAgIHJhbkxpYigkbGliKTsKICAgICAgICAgfQogICAgIH0KICAgICAK QEAgLTI4MSw3ICsyODcsNyBAQCBpZiAoJGxsdm0pIHsKICAgICAgICAgICAgICAgICB8fCAhZmls ZUNvbnRlbnRzRXF1YWxzKCRyYW5saWJUb2tlbiwgJHNvdXJjZUxpYnJhcnkpCiAgICAgICAgICAg ICAgICAgfHwgLU0gJHJhbmxpYlRva2VuID4gLU0gJHNvdXJjZUxpYnJhcnkpIHsKICAgICAgICAg ICAgICAgICBwcmludCAiICAgUmFubGliICRmaWxlbmFtZVxuIjsKLSAgICAgICAgICAgICAgICAo c3lzdGVtKCRyYW5saWIsICR0YXJnZXRMaWJyYXJ5KSA9PSAwKSBvciBkaWU7CisgICAgICAgICAg ICAgICAgcmFuTGliKCR0YXJnZXRMaWJyYXJ5KTsKICAgICAgICAgICAgICAgICAob3BlbiBteSAk ZmlsZUhhbmRsZSwgIj4iLCAkcmFubGliVG9rZW4pIG9yIGRpZTsKICAgICAgICAgICAgICAgICBw cmludCB7JGZpbGVIYW5kbGV9ICIkc291cmNlTGlicmFyeSI7CiAgICAgICAgICAgICAgICAgY2xv c2UgJGZpbGVIYW5kbGU7Cg== 243567 2014-12-19 12:48:48 -0800 2014-12-19 15:06:09 -0800 Patch bug-139829-20141219124848.patch text/plain 5997 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3NTYwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZmUzZjkxMzBiMzgyZTQ4ZTUyY2I5ZmVkMGIzZDQ2MGEy MDViMDliNC4uZjgwYTBkMTM1ZTk2MmRlNDExNmRiZTkzZGM0MTIyMTEwM2QyOTJhYiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMy IEBACisyMDE0LTEyLTE5ICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAg ICAgICBjb3B5LXdlYmtpdGxpYnJhcmllcy10by1wcm9kdWN0LWRpcmVjdG9yeSB1c2VzIHdyb25n IFNESyB3aGVuIGNhbGxlZCBmcm9tIGJ1aWxkLXdlYmtpdAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5ODI5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHNjcmlwdCBidWlsZC13ZWJraXQgY2FsbHMg c2NyaXB0IGNvcHktd2Via2l0bGlicmFyaWVzLXRvLXByb2R1Y3QtZGlyZWN0b3J5IHdpdGgKKyAg ICAgICAgYXJndW1lbnQgLS1zZGsgdG8gc3BlY2lmeSB0aGUgWGNvZGUgU0RLIHRvIHVzZSwgYnV0 IGNvcHktd2Via2l0bGlicmFyaWVzLXRvLXByb2R1Y3QtZGlyZWN0b3J5CisgICAgICAgIGV4cGVj dHMgdGhlIFhjb2RlIFNESyB0byBiZSBzcGVjaWZpZWQgdXNpbmcgdGhlIC0tc2RrLW5hbWUgY29t bWFuZCBsaW5lIGFyZ3VtZW50LgorCisgICAgICAgIEN1cnJlbnRseSBjb3B5LXdlYmtpdGxpYnJh cmllcy10by1wcm9kdWN0LWRpcmVjdG9yeSBoYXMgaXRzIG93biBsb2dpYyB0byBoYW5kbGUKKyAg ICAgICAgcGFyc2luZyBmb3IgYSBzcGVjaWZpZWQgWGNvZGUgU0RLLiBJbnN0ZWFkIHdlIHNob3Vs ZCBtYWtlIHVzZSBvZiB0aGUgd2Via2l0ZGlycy5wbQorICAgICAgICBsb2dpYyB0byBib3RoIGF2 b2lkIGR1cGxpY2F0aW5nIGVmZm9ydCBhbmQgbWFrZSB0aGUgY29tbWFuZCBsaW5lIG9wdGlvbnMg Zm9yCisgICAgICAgIGNvcHktd2Via2l0bGlicmFyaWVzLXRvLXByb2R1Y3QtZGlyZWN0b3J5IGZv ciBzcGVjaWZ5IHRoZSBYY29kZSBTREsgY29uc2lzdGVudAorICAgICAgICB3aXRoIHRoZSBhcHBy b2FjaCB1c2VkIGluIG90aGVyIFdlYktpdCB0b29scy4KKworICAgICAgICBBcyBhIHNpZGUgZWZm ZWN0IG9mIG1ha2luZyB1c2Ugb2YgdGhlIHdlYmtpdGRpcnMucG0gbG9naWMgZm9yIGRldGVybWlu aW5nIHRoZSBYY29kZSBTREsKKyAgICAgICAgY29weS13ZWJraXRsaWJyYXJpZXMtdG8tcHJvZHVj dC1kaXJlY3Rvcnkgbm93IHJlY29nbml6ZXMgLS1kZXZpY2UgYW5kIC0tc2ltdWxhdG9yCisgICAg ICAgIHNob3J0aGFuZHMgZm9yIC0tc2RrPWlwaG9uZW9zLmludGVybmFsIGFuZCAtLXNkaz1pcGhv bmVzaW11bGF0b3IsIHJlc3BlY3RpdmVseS4KKworICAgICAgICAqIFNjcmlwdHMvY29weS13ZWJr aXRsaWJyYXJpZXMtdG8tcHJvZHVjdC1kaXJlY3Rvcnk6IEFsc28sIHJlbmFtZWQgc29tZSB2YXJp YWJsZXMgdG8KKyAgICAgICAgaW1wcm92ZSB0aGUgcmVhZGFiaWxpdHkgb2YgdGhlIGNvZGUuCisg ICAgICAgIChyYW5MaWIpOiBBZGRlZDsgY29udmVuaWVuY2UgZnVuY3Rpb24gdGhhdCBjYWxscyB0 aGUgUkFOTElCKDEpIHdpdGggdGhlIGFwcHJvcHJpYXRlCisgICAgICAgIFhjb2RlIFNESy4gV2Ug cGFzcyAtbm9fd2FybmluZ19mb3Jfbm9fc3ltYm9scyB0byBSQU5MSUIoMSkgd2hlbiB1c2luZyBh biBYY29kZSBTREsKKyAgICAgICAgZm9yIGlPUyBzaW5jZSBpdCdzIGFjY2VwdGFibGUgdGhhdCBh biBlbXB0eSBvYmplY3QgZmlsZSAoc2F5LCBmb3IgYSBNYWMtc3BlY2lmaWMgZmVhdHVyZSkKKyAg ICAgICAgYmUgaW5jbHVkZWQgaW4gYSBsaWJyYXJ5LgorICAgICAgICAodW5wYWNrSWZOZWNlc3Nh cnkpOiBNb2RpZmllZCB0byBjYWxsIHJhbkxpYigpLgorCiAyMDE0LTEyLTE4ICBCcmVudCBGdWxn aGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAgICAgICAgIFtXaW5dIFVwZGF0ZSBEdW1wUmVu ZGVyVHJlZSB0byBtb3JlIGNsb3NlbHkgbWF0Y2ggTWFjIHZlcnNpb24KZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvY29weS13ZWJraXRsaWJyYXJpZXMtdG8tcHJvZHVjdC1kaXJlY3RvcnkgYi9U b29scy9TY3JpcHRzL2NvcHktd2Via2l0bGlicmFyaWVzLXRvLXByb2R1Y3QtZGlyZWN0b3J5Cmlu ZGV4IDY4ZmVkNzQ0MWIwYWY0ZWQzOTVhZTg3YmEyYmY3ZTNiZjI5YzYxODcuLjcxYzljYjY0NTk4 ZjA0ZmYyMWVlNzdhOWJjODEzM2NiZGJiZDAyMmMgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv Y29weS13ZWJraXRsaWJyYXJpZXMtdG8tcHJvZHVjdC1kaXJlY3RvcnkKKysrIGIvVG9vbHMvU2Ny aXB0cy9jb3B5LXdlYmtpdGxpYnJhcmllcy10by1wcm9kdWN0LWRpcmVjdG9yeQpAQCAtNTcsNyAr NTcsOSBAQCBVc2FnZTogJHByb2dyYW1OYW1lIFtvcHRpb25zXQogICAtLVtuby1dcHJlZmVyLXN5 c3RlbS1sbHZtICAgICBUb2dnbGUgcHJlZmVycmluZyB0aGUgc3lzdGVtIExMVk0gb3ZlciB0aGUg YmluYXJ5IGRyb3BzIChkZWZhdWx0OiAkcHJlZmVyU3lzdGVtTExWTU92ZXJEcm9wcykKICAgLS1s bHZtLXN1YmRpcmVjdG9yeT08bmFtZT4gICAgU2V0IHRoZSBuYW1lIG9mIHRoZSBMTFZNIHN1YmRp cmVjdG9yeSB0byBzZWFyY2ggZm9yIChkZWZhdWx0OiAkbGx2bVN1YmRpcmVjdG9yeU5hbWUpCiAg IC0tbGx2bS1wcmVmaXg9PHBhdGg+ICAgICAgICAgIFNldCB0aGUgcHJlZml4IGludG8gd2hpY2gg TExWTSBpcyBpbnN0YWxsZWQgKGRlZmF1bHQ6ICRsbHZtUHJlZml4KQotICAtLXNkay1uYW1lPTxu YW1lPiAgICAgICAgICAgICBTZXQgdGhlIG5hbWUgb2YgdGhlIFhjb2RlIFNESyB0byB1c2UuCisg IC0tc2RrPTxzZGs+ICAgICAgICAgICAgICAgICAgIFVzZSBhIHNwZWNpZmljIFhjb2RlIFNESwor ICAtLWRldmljZSAgICAgICAgICAgICAgICAgICAgICBVc2UgdGhlIGN1cnJlbnQgaXBob25lb3Mu aW50ZXJuYWwgU0RLIChpT1Mgb25seSkKKyAgLS1zaW11bGF0b3IgICAgICAgICAgICAgICAgICAg VXNlIHRoZSBjdXJyZW50IGlwaG9uZXNpbXVsYXRvciBTREsgKGlPUyBvbmx5KQogICAtLW9zeC12 ZXJzaW9uPTx2ZXJzaW9uPiAgICAgICBTZXQgdGhlIE9TIFggdmVyc2lvbiB0byB1c2Ugd2hlbiBk ZWNpZGluZyB3aGF0IHRvIGNvcHkuCiAgIC0tW25vLV1mb3JjZSAgICAgICAgICAgICAgICAgIFRv Z2dsZSBmb3JjaW5nIHRoZSBjb3B5IC0gaS5lLiBpZ25vcmluZyB0aW1lc3RhbXBzIChkZWZhdWx0 OiAkZm9yY2UpCiBFT0YKQEAgLTczLDcgKzc1LDYgQEAgR2V0T3B0aW9ucygKICAgICAncHJlZmVy LXN5c3RlbS1sbHZtIScgPT4gXCRwcmVmZXJTeXN0ZW1MTFZNT3ZlckRyb3BzLAogICAgICdsbHZt LXN1YmRpcmVjdG9yeT1zJyA9PiBcJGxsdm1TdWJkaXJlY3RvcnlOYW1lLAogICAgICdsbHZtLXBy ZWZpeD1zJyA9PiBcJGxsdm1QcmVmaXgsCi0gICAgJ3Nkay1uYW1lPXMnID0+IFwkc2RrTmFtZSwK ICAgICAnb3N4LXZlcnNpb249cycgPT4gXCRvc3hWZXJzaW9uLAogICAgICdmb3JjZSEnID0+IFwk Zm9yY2UKICk7CkBAIC04Myw2ICs4NCw4IEBAIGlmICgkc2hvd0hlbHApIHsKICAgIGV4aXQgMTsK IH0KIAorZGV0ZXJtaW5lWGNvZGVTREsoKTsKKwogbXkgJHByb2R1Y3REaXIgPSBzaGlmdCBAQVJH VjsKIGlmICgkcHJvZHVjdERpcikgewogICAgICRwcm9kdWN0RGlyID0gRmlsZTo6U3BlYy0+cmVs MmFicygkcHJvZHVjdERpcik7CkBAIC05NywxMiArMTAwLDE1IEBAIGlmICghJG9zeFZlcnNpb24p IHsKIAogY2hkaXJXZWJLaXQoKTsKIAotbXkgJHhjcnVuT3B0aW9ucyA9ICIiOwotaWYgKCRzZGtO YW1lIG5lICIiKSB7Ci0gICAgJHhjcnVuT3B0aW9ucyAuPSAiIC1zZGsgJHNka05hbWUiOworc3Vi IHJhbkxpYigkKQoreworICAgIG15ICgkbGlicmFyeSkgPSBAXzsKKyAgICBteSBAYXJnczsKKyAg ICBwdXNoIEBhcmdzLCAoIi1zZGsiLCB4Y29kZVNESygpKSBpZiB4Y29kZVNESygpOworICAgIHB1 c2ggQGFyZ3MsICJyYW5saWIiOworICAgIHB1c2ggQGFyZ3MsICItbm9fd2FybmluZ19mb3Jfbm9f c3ltYm9scyIgaWYgaXNJT1NXZWJLaXQoKTsKKyAgICBzeXN0ZW0oInhjcnVuIiwgQGFyZ3MsICRs aWJyYXJ5KSA9PSAwIG9yIGRpZTsKIH0KLW15ICRyYW5saWIgPSBgeGNydW4gJHhjcnVuT3B0aW9u cyAtZmluZCByYW5saWJgOwotY2hvbXAgJHJhbmxpYjsKIAogc3ViIHVucGFja0lmTmVjZXNzYXJ5 CiB7CkBAIC0xMTQsNyArMTIwLDcgQEAgc3ViIHVucGFja0lmTmVjZXNzYXJ5CiAgICAgICAgICAg ICBmb3JlYWNoIG15ICRsaWJyYXJ5IChgdGFyIC10ZiAkcGFja2FnZWApIHsKICAgICAgICAgICAg ICAgICBjaG9tcCAkbGlicmFyeTsKICAgICAgICAgICAgICAgICBwcmludCAiICAgUmFubGliICRs aWJyYXJ5XG4iOwotICAgICAgICAgICAgICAgIChzeXN0ZW0oJHJhbmxpYiwgJHRhcmdldERpciAu ICIvIiAuICRsaWJyYXJ5KSA9PSAwKSBvciBkaWU7CisgICAgICAgICAgICAgICAgcmFuTGliKCR0 YXJnZXREaXIgLiAiLyIgLiAkbGlicmFyeSk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAg ICAgICAgcmV0dXJuIDE7CkBAIC0xNDMsMTMgKzE0OSwxMyBAQCBpZiAoJHdrc2kpIHsKICAgICAg ICAgImxpYldlYktpdFN5c3RlbUludGVyZmFjZVlvc2VtaXRlLmEiLAogICAgICk7CiAgICAgCi0g ICAgZm9yZWFjaCBteSAkbGliTmFtZSAoQGxpYnJhcmllc1RvQ29weSkgewotICAgICAgICBteSAk c3JjTGliID0gIldlYktpdExpYnJhcmllcy8iIC4gJGxpYk5hbWU7Ci0gICAgICAgIG15ICRsaWIg PSAiJGxpYnJhcnlEaXIvIiAuICRsaWJOYW1lOwotICAgICAgICBpZiAoJGZvcmNlIHx8ICEtZSAk bGliIHx8IC1NICRsaWIgPiAtTSAkc3JjTGliKSB7Ci0gICAgICAgICAgICBwcmludCAiVXBkYXRp bmcgJGxpYlxuIjsKLSAgICAgICAgICAgIChzeXN0ZW0oImRpdHRvIiwgJHNyY0xpYiwgJGxpYikg PT0gMCkgb3IgZGllOwotICAgICAgICAgICAgKHN5c3RlbSgkcmFubGliLCAkbGliKSA9PSAwKSBv ciBkaWU7CisgICAgZm9yZWFjaCBteSAkbGlicmFyeU5hbWUgKEBsaWJyYXJpZXNUb0NvcHkpIHsK KyAgICAgICAgbXkgJHNvdXJjZUxpYnJhcnkgPSAiV2ViS2l0TGlicmFyaWVzLyIgLiAkbGlicmFy eU5hbWU7CisgICAgICAgIG15ICR0YXJnZXRMaWJyYXJ5ID0gIiRsaWJyYXJ5RGlyLyIgLiAkbGli cmFyeU5hbWU7CisgICAgICAgIGlmICgkZm9yY2UgfHwgIS1lICR0YXJnZXRMaWJyYXJ5IHx8IC1N ICR0YXJnZXRMaWJyYXJ5ID4gLU0gJHNvdXJjZUxpYnJhcnkpIHsKKyAgICAgICAgICAgIHByaW50 ICJVcGRhdGluZyAkdGFyZ2V0TGlicmFyeVxuIjsKKyAgICAgICAgICAgIChzeXN0ZW0oImRpdHRv IiwgJHNvdXJjZUxpYnJhcnksICR0YXJnZXRMaWJyYXJ5KSA9PSAwKSBvciBkaWU7CisgICAgICAg ICAgICByYW5MaWIoJHRhcmdldExpYnJhcnkpOwogICAgICAgICB9CiAgICAgfQogICAgIApAQCAt MjgxLDcgKzI4Nyw3IEBAIGlmICgkbGx2bSkgewogICAgICAgICAgICAgICAgIHx8ICFmaWxlQ29u dGVudHNFcXVhbHMoJHJhbmxpYlRva2VuLCAkc291cmNlTGlicmFyeSkKICAgICAgICAgICAgICAg ICB8fCAtTSAkcmFubGliVG9rZW4gPiAtTSAkc291cmNlTGlicmFyeSkgewogICAgICAgICAgICAg ICAgIHByaW50ICIgICBSYW5saWIgJGZpbGVuYW1lXG4iOwotICAgICAgICAgICAgICAgIChzeXN0 ZW0oJHJhbmxpYiwgJHRhcmdldExpYnJhcnkpID09IDApIG9yIGRpZTsKKyAgICAgICAgICAgICAg ICByYW5MaWIoJHRhcmdldExpYnJhcnkpOwogICAgICAgICAgICAgICAgIChvcGVuIG15ICRmaWxl SGFuZGxlLCAiPiIsICRyYW5saWJUb2tlbikgb3IgZGllOwogICAgICAgICAgICAgICAgIHByaW50 IHskZmlsZUhhbmRsZX0gIiRzb3VyY2VMaWJyYXJ5IjsKICAgICAgICAgICAgICAgICBjbG9zZSAk ZmlsZUhhbmRsZTsK