74308 2011-12-12 09:54:21 -0800 build-jsc passing incorrect args to buildGtkProject 2011-12-13 10:10:56 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 wingo mrobinson mrobinson oldest_to_newest 519287 0 wingo 2011-12-12 09:54:21 -0800 Patch forthcoming. 519288 1 118812 wingo 2011-12-12 09:56:55 -0800 Created attachment 118812 Patch 519301 2 118812 mrobinson 2011-12-12 10:19:08 -0800 Comment on attachment 118812 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=118812&action=review > Tools/Scripts/build-jsc:74 > + my $allowWebKit2 = 1; > + $result = buildGtkProject("JavaScriptCore", 0, 1, @ARGV); Do you mean to pass $allowWebKit2 here instead of 1? 519308 3 mrobinson 2011-12-12 10:21:55 -0800 I agree that this argument is a bit pointless for other projects. I think it would be smarter to simply add --enable-webkit2=no to @options in build-webkit instead of keeping the extra argument around. What do you think? 519311 4 wingo 2011-12-12 10:27:37 -0800 > > + my $allowWebKit2 = 1; > > + $result = buildGtkProject("JavaScriptCore", 0, 1, @ARGV); > > Do you mean to pass $allowWebKit2 here instead of 1? Heh, indeed. Will fix eventually. (In reply to comment #3) > I agree that this argument is a bit pointless for other projects. I think it would be smarter to simply add --enable-webkit2=no to @options in build-webkit instead of keeping the extra argument around. What do you think? The default in build-webkit is to enable it, so that should be the default in jsc, so as to avoid needless autofoo churn. Therefore another way of defaulting it would be needed. I punted. 519316 5 mrobinson 2011-12-12 10:31:43 -0800 > > I agree that this argument is a bit pointless for other projects. I think it would be smarter to simply add --enable-webkit2=no to @options in build-webkit instead of keeping the extra argument around. What do you think? > > The default in build-webkit is to enable it, so that should be the default in jsc, so as to avoid needless autofoo churn. Therefore another way of defaulting it would be needed. I punted. Sorry, my proposal wasn't very clear: 1. Remove the WebKit2 argument completely. 2. If --no-webkit2 was passed to build-webkit, just add --enable-webkit2=no to @options in build-webkit. This would allow us to have no code at all dealing with it in build-jsc and to avoid leaking details of this option down the call stack. 520081 6 119019 wingo 2011-12-13 08:02:52 -0800 Created attachment 119019 Patch 520083 7 wingo 2011-12-13 08:09:43 -0800 Does the newly attached patch work for you? 520090 8 119019 mrobinson 2011-12-13 08:34:07 -0800 Comment on attachment 119019 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=119019&action=review This seems a lot cleaner, but see my comment below... > Tools/Scripts/build-webkit:754 > + if ($noWebKit2) { > + unshift(@options, "--disable-webkit2"); > + } configure.ac has WebKit2 disabled by default. I guess this logic should be reversed. Sorry, I think I led you astray here. 520093 9 119022 wingo 2011-12-13 08:35:12 -0800 Created attachment 119022 Patch 520103 10 119022 mrobinson 2011-12-13 08:54:10 -0800 Comment on attachment 119022 Patch Thank you! 520140 11 119030 mrobinson 2011-12-13 09:57:48 -0800 Created attachment 119030 Patch which also prevents reconfiguration 520143 12 119030 gustavo 2011-12-13 10:05:11 -0800 Comment on attachment 119030 Patch which also prevents reconfiguration ok, cleaner is gooder =) 520148 13 mrobinson 2011-12-13 10:10:56 -0800 Committed r102685: <http://trac.webkit.org/changeset/102685> 118812 2011-12-12 09:56:55 -0800 2011-12-13 08:02:36 -0800 Patch bug-74308-20111212185653.patch text/plain 1430 wingo U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyNTY0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTYyOTU4YWZmYmUxMWY2MmI4MWNkMWJhYjFhZTlhNmY0 OTZiNGUyMS4uMWM0YTZmYjEyMDNmYjUyMmEyMTUwMDI3NjNlMTlhNTkzZDBlNDRlMiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEz IEBACisyMDExLTEyLTEyICBBbmR5IFdpbmdvICA8d2luZ29AcG9ib3guY29tPgorCisgICAgICAg IGJ1aWxkLWpzYyBwYXNzaW5nIGluY29ycmVjdCBhcmdzIHRvIGJ1aWxkR3RrUHJvamVjdAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzQzMDgKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkuCisKKyAgICAgICAgKiBTY3JpcHRzL2J1aWxkLWpzYzog SW52b2tlIGJ1aWxkR3RrUHJvamVjdCB3aXRoIHRoZSBjb3JyZWN0IHNldAorICAgICAgICBvZiBh cmd1bWVudHMuCisKIDIwMTEtMTItMTIgIEtlbnRhcm8gSGFyYSAgPGhhcmFrZW5AY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFtSZWZhY3RvcmluZ10gSW4gcHJlcGFyZS1DaGFuZ2VMb2csIG1vdmUg aW50byBhIG1ldGhvZCB0aGUgdG9wLWxldmVsIGNvZGUKZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvYnVpbGQtanNjIGIvVG9vbHMvU2NyaXB0cy9idWlsZC1qc2MKaW5kZXggY2NmYjdhNzVlYzky ZWFiMDk2MGVhNjk3Njk1ZmRmMjUwODBiMzRhMC4uNzM1MGEzNWI2NTBhYmFhZTRkZGRhMmJkNzQx ODYzNGUzN2NmMDA5NSAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9idWlsZC1qc2MKKysrIGIv VG9vbHMvU2NyaXB0cy9idWlsZC1qc2MKQEAgLTY5LDcgKzY5LDkgQEAgaWYgKGlzQXBwbGVNYWNX ZWJLaXQoKSkgewogICAgICRyZXN1bHQgPSBidWlsZFZpc3VhbFN0dWRpb1Byb2plY3QoIkphdmFT Y3JpcHRDb3JlLnZjcHJvai9KYXZhU2NyaXB0Q29yZS5zbG4iKTsKIH0gZWxzaWYgKGlzR3RrKCkp IHsKICAgICBjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoIi0tZ3RrIik7Ci0gICAg JHJlc3VsdCA9IGJ1aWxkR3RrUHJvamVjdCgiSmF2YVNjcmlwdENvcmUiLCAwLCBAQVJHVik7Cisg ICAgIyBBIHBvaW50bGVzcyBhcmd1bWVudCwgYnV0IG9uZSB0aGF0IGJ1aWxkR3RrUHJvamVjdCB0 YWtlcy4KKyAgICBteSAkYWxsb3dXZWJLaXQyID0gMTsKKyAgICAkcmVzdWx0ID0gYnVpbGRHdGtQ cm9qZWN0KCJKYXZhU2NyaXB0Q29yZSIsIDAsIDEsIEBBUkdWKTsKIH0gZWxzaWYgKGlzUXQoKSkg ewogICAgICMgUmVtb3ZlIGR1cGxpY2F0ZWQgLS1xdCBvcHRpb25zIHRvIGF2b2lkIHBhc3Npbmcg dGhlbSB0byBxbWFrZQogICAgIGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQVJHVigiLS1x dCIpOwo= 119019 2011-12-13 08:02:52 -0800 2011-12-13 08:35:01 -0800 Patch bug-74308-20111213170250.patch text/plain 3076 wingo U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyNjYxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNmZlZDI5NzY4YTZkOWE2ODQ2NDVjZjA0YWJlZjkzYzYz MzA1YmFlNy4uYjY2OTYxNGVjMDBmMjcyNDAwYWEzNGNhOTlkNDFiZWVkMDIyMzBkZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDExLTEyLTEyICBBbmR5IFdpbmdvICA8d2luZ29AaWdhbGlhLmNvbT4KKworICAgICAg ICBidWlsZC1qc2MgcGFzc2luZyBpbmNvcnJlY3QgYXJncyB0byBidWlsZEd0a1Byb2plY3QKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc0MzA4CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZLgorCisgICAgICAgICogU2NyaXB0cy9idWlsZC13ZWJr aXQ6IEluc3RlYWQgb2YgaW52b2tpbmcgYnVpbGRHdGtQcm9qZWN0IHdpdGgKKyAgICAgICAgYW5v dGhlciBhcmd1bWVudCBhYm91dCB3ZWJraXQyLCB1bnNoaWZ0IGEgLS1kaXNhYmxlLXdlYmtpdDIK KyAgICAgICAgYXJndW1lbnQgb250byB0aGUgYnVpbGRBcmdzLgorICAgICAgICAqIFNjcmlwdHMv d2Via2l0ZGlycy5wbSAoYnVpbGRBdXRvdG9vbHNQcm9qZWN0LCBidWlsZEd0a1Byb2plY3QpOgor ICAgICAgICBSZW1vdmUgJGVuYWJsZVdlYktpdDIgYXJnLgorCiAyMDExLTEyLTEzICBLZW5pY2hp IElzaGliYXNoaSAgPGJhc2hpQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCwgcmVt b3ZlZCBvbmUgb2YgbXkgZW1haWwgYWRkcmVzc2VzIHRvIHVzZSB0aGUgYXBwcnByaWF0ZSBvbmUu CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdCBiL1Rvb2xzL1NjcmlwdHMv YnVpbGQtd2Via2l0CmluZGV4IGVlZDI4ZmZhMGFjMDVmYzhlNTkzZjY2MGIzODI0YTdiNjNlMTE1 ZjMuLjkyMmUzNDczOTQ5NzliOTEwOWMyZGJmMDI4NzE4NzQ1N2Y1MTk2ZTcgMTAwNzU1Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0CisrKyBiL1Rvb2xzL1NjcmlwdHMvYnVpbGQtd2Vi a2l0CkBAIC03NDksNyArNzQ5LDEwIEBAIGZvciBteSAkZGlyIChAcHJvamVjdHMpIHsKIAogICAg IG15ICRwcm9qZWN0ID0gYmFzZW5hbWUoJGRpcik7CiAgICAgaWYgKGlzR3RrKCkpIHsKLSAgICAg ICAgJHJlc3VsdCA9IGJ1aWxkR3RrUHJvamVjdCgkcHJvamVjdCwgJGNsZWFuLCAhJG5vV2ViS2l0 MiwgQG9wdGlvbnMpOworICAgICAgICBpZiAoJG5vV2ViS2l0MikgeworICAgICAgICAgICAgdW5z aGlmdChAb3B0aW9ucywgIi0tZGlzYWJsZS13ZWJraXQyIik7CisgICAgICAgIH0KKyAgICAgICAg JHJlc3VsdCA9IGJ1aWxkR3RrUHJvamVjdCgkcHJvamVjdCwgJGNsZWFuLCBAb3B0aW9ucyk7CiAg ICAgfSBlbHNpZiAoaXNRdCgpKSB7CiAgICAgICAgICNGSVhNRTogJGRpciBzaG91bGQgcHJvYmFi bHkgYmUgJHByb2plY3QuCiAgICAgICAgICRyZXN1bHQgPSBidWlsZFFNYWtlUXRQcm9qZWN0KCRk aXIsICRjbGVhbiwgQG9wdGlvbnMpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRk aXJzLnBtIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCmluZGV4IDhjZWQ0ZjNjOTNmYjE5 ZjdkODk5ZGYzZGViZjhiMzYyZTc2YzhjNmQuLjlkNTAyZmNmZWQ3Y2IxN2NmMzI5YzgzNjQ1Zjlj MDAwMDhkZTRhMzcgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KQEAgLTE2NjAsNyArMTY2MCw3IEBAIHN1YiBt dXN0UmVSdW5BdXRvZ2VuKCRAKQogCiBzdWIgYnVpbGRBdXRvdG9vbHNQcm9qZWN0KCRAKQogewot ICAgIG15ICgkcHJvamVjdCwgJGNsZWFuLCAkZW5hYmxlV2ViS2l0MiwgQGJ1aWxkUGFyYW1zKSA9 IEBfOworICAgIG15ICgkcHJvamVjdCwgJGNsZWFuLCBAYnVpbGRQYXJhbXMpID0gQF87CiAKICAg ICBteSAkbWFrZSA9ICdtYWtlJzsKICAgICBteSAkZGlyID0gcHJvZHVjdERpcigpOwpAQCAtMTY5 MSwxMiArMTY5MSw2IEBAIHN1YiBidWlsZEF1dG90b29sc1Byb2plY3QoJEApCiAgICAgICAgICRt YWtlQXJncyAuPSAiIGpzYyI7CiAgICAgfQogCi0gICAgIyBUaGlzIGlzIGEgdGVtcG9yYXJ5IHdv cmstYXJvdW5kIHRvIGVuYWJsZSBidWlsZGluZyBXZWJLaXQyIG9uIHRoZSBib3RzLAotICAgICMg YnV0IGVuc3VyaW5nIHRoYXQgaXQgZG9lcyBub3Qgc2hpcCB1bnRpbCB0aGUgQVBJIGlzIHN0YWJs ZS4KLSAgICBpZiAoJHByb2plY3QgZXEgIldlYktpdCIgYW5kIGlzR3RrKCkgYW5kICRlbmFibGVX ZWJLaXQyKSB7Ci0gICAgICAgIHB1c2ggQGJ1aWxkQXJncywgIi0tZW5hYmxlLXdlYmtpdDIiOwot ICAgIH0KLQogICAgICRwcmVmaXggPSAkRU5WeyJXZWJLaXRJbnN0YWxsYXRpb25QcmVmaXgifSBp ZiAhZGVmaW5lZCgkcHJlZml4KTsKICAgICBwdXNoIEBidWlsZEFyZ3MsICItLXByZWZpeD0iIC4g JHByZWZpeCBpZiBkZWZpbmVkKCRwcmVmaXgpOwogCkBAIC0xOTg5LDEzICsxOTgzLDEzIEBAIHN1 YiBidWlsZFFNYWtlUXRQcm9qZWN0KCQkQCkKIAogc3ViIGJ1aWxkR3RrUHJvamVjdAogewotICAg IG15ICgkcHJvamVjdCwgJGNsZWFuLCAkZW5hYmxlV2ViS2l0MiwgQGJ1aWxkQXJncykgPSBAXzsK KyAgICBteSAoJHByb2plY3QsICRjbGVhbiwgQGJ1aWxkQXJncykgPSBAXzsKIAogICAgIGlmICgk cHJvamVjdCBuZSAiV2ViS2l0IiBhbmQgJHByb2plY3QgbmUgIkphdmFTY3JpcHRDb3JlIikgewog ICAgICAgICBkaWUgIlVuc3VwcG9ydGVkIHByb2plY3Q6ICRwcm9qZWN0LiBTdXBwb3J0ZWQgcHJv amVjdHM6IFdlYktpdCwgSmF2YVNjcmlwdENvcmVcbiI7CiAgICAgfQogCi0gICAgcmV0dXJuIGJ1 aWxkQXV0b3Rvb2xzUHJvamVjdCgkcHJvamVjdCwgJGNsZWFuLCAkZW5hYmxlV2ViS2l0MiwgQGJ1 aWxkQXJncyk7CisgICAgcmV0dXJuIGJ1aWxkQXV0b3Rvb2xzUHJvamVjdCgkcHJvamVjdCwgJGNs ZWFuLCBAYnVpbGRBcmdzKTsKIH0KIAogc3ViIGJ1aWxkQ2hyb21pdW1NYWtlZmlsZSgkJEApCg== 119022 2011-12-13 08:35:12 -0800 2011-12-13 09:57:25 -0800 Patch bug-74308-20111213173510.patch text/plain 3059 wingo U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyNjgwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMWZhZmM5NDAwOTNkOWE4OTU3YWMwZTUyNjc5ZDZiMGFh YTM3MzYzMC4uODJkZTFiODg3M2EwMDBjY2ZlNjFiODM1ZmMwMTAyMzZiNTU5NzViMiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDExLTEyLTEyICBBbmR5IFdpbmdvICA8d2luZ29AaWdhbGlhLmNvbT4KKworICAgICAg ICBidWlsZC1qc2MgcGFzc2luZyBpbmNvcnJlY3QgYXJncyB0byBidWlsZEd0a1Byb2plY3QKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc0MzA4CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZLgorCisgICAgICAgICogU2NyaXB0cy9idWlsZC13ZWJr aXQ6IEluc3RlYWQgb2YgaW52b2tpbmcgYnVpbGRHdGtQcm9qZWN0IHdpdGgKKyAgICAgICAgYW5v dGhlciBhcmd1bWVudCBhYm91dCB3ZWJraXQyLCB1bnNoaWZ0IGFuIC0tZW5hYmxlLXdlYmtpdDIK KyAgICAgICAgYXJndW1lbnQgb250byB0aGUgYnVpbGRBcmdzLgorICAgICAgICAqIFNjcmlwdHMv d2Via2l0ZGlycy5wbSAoYnVpbGRBdXRvdG9vbHNQcm9qZWN0LCBidWlsZEd0a1Byb2plY3QpOgor ICAgICAgICBSZW1vdmUgJGVuYWJsZVdlYktpdDIgYXJnLgorCiAyMDExLTEyLTEzICBUb3IgQXJu ZSBWZXN0YsO4ICA8dG9yLmFybmUudmVzdGJvQG5va2lhLmNvbT4KIAogICAgICAgICBbUXRdIEdl dCByaWQgb2YgbGF5ZXJpbmcgdmlvbGF0aW9ucyBpbiBpbmNsdWRlcwpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy9idWlsZC13ZWJraXQgYi9Ub29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAppbmRl eCBlZWQyOGZmYTBhYzA1ZmM4ZTU5M2Y2NjBiMzgyNGE3YjYzZTExNWYzLi5lN2RhZjI0Y2UzNzc4 MDI2ZWNkMWI0YTQ4NTAzN2E3YTY3NjBmOTBiIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL2J1 aWxkLXdlYmtpdAorKysgYi9Ub29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdApAQCAtNzQ5LDcgKzc0 OSwxMCBAQCBmb3IgbXkgJGRpciAoQHByb2plY3RzKSB7CiAKICAgICBteSAkcHJvamVjdCA9IGJh c2VuYW1lKCRkaXIpOwogICAgIGlmIChpc0d0aygpKSB7Ci0gICAgICAgICRyZXN1bHQgPSBidWls ZEd0a1Byb2plY3QoJHByb2plY3QsICRjbGVhbiwgISRub1dlYktpdDIsIEBvcHRpb25zKTsKKyAg ICAgICAgaWYgKCEkbm9XZWJLaXQyKSB7CisgICAgICAgICAgICB1bnNoaWZ0KEBvcHRpb25zLCAi LS1lbmFibGUtd2Via2l0MiIpOworICAgICAgICB9CisgICAgICAgICRyZXN1bHQgPSBidWlsZEd0 a1Byb2plY3QoJHByb2plY3QsICRjbGVhbiwgQG9wdGlvbnMpOwogICAgIH0gZWxzaWYgKGlzUXQo KSkgewogICAgICAgICAjRklYTUU6ICRkaXIgc2hvdWxkIHByb2JhYmx5IGJlICRwcm9qZWN0Lgog ICAgICAgICAkcmVzdWx0ID0gYnVpbGRRTWFrZVF0UHJvamVjdCgkZGlyLCAkY2xlYW4sIEBvcHRp b25zKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0ZGlycy5wbQppbmRleCA4Y2VkNGYzYzkzZmIxOWY3ZDg5OWRmM2RlYmY4YjM2 MmU3NmM4YzZkLi45ZDUwMmZjZmVkN2NiMTdjZjMyOWM4MzY0NWY5YzAwMDA4ZGU0YTM3IDEwMDc1 NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRkaXJzLnBtCkBAIC0xNjYwLDcgKzE2NjAsNyBAQCBzdWIgbXVzdFJlUnVuQXV0b2dlbigk QCkKIAogc3ViIGJ1aWxkQXV0b3Rvb2xzUHJvamVjdCgkQCkKIHsKLSAgICBteSAoJHByb2plY3Qs ICRjbGVhbiwgJGVuYWJsZVdlYktpdDIsIEBidWlsZFBhcmFtcykgPSBAXzsKKyAgICBteSAoJHBy b2plY3QsICRjbGVhbiwgQGJ1aWxkUGFyYW1zKSA9IEBfOwogCiAgICAgbXkgJG1ha2UgPSAnbWFr ZSc7CiAgICAgbXkgJGRpciA9IHByb2R1Y3REaXIoKTsKQEAgLTE2OTEsMTIgKzE2OTEsNiBAQCBz dWIgYnVpbGRBdXRvdG9vbHNQcm9qZWN0KCRAKQogICAgICAgICAkbWFrZUFyZ3MgLj0gIiBqc2Mi OwogICAgIH0KIAotICAgICMgVGhpcyBpcyBhIHRlbXBvcmFyeSB3b3JrLWFyb3VuZCB0byBlbmFi bGUgYnVpbGRpbmcgV2ViS2l0MiBvbiB0aGUgYm90cywKLSAgICAjIGJ1dCBlbnN1cmluZyB0aGF0 IGl0IGRvZXMgbm90IHNoaXAgdW50aWwgdGhlIEFQSSBpcyBzdGFibGUuCi0gICAgaWYgKCRwcm9q ZWN0IGVxICJXZWJLaXQiIGFuZCBpc0d0aygpIGFuZCAkZW5hYmxlV2ViS2l0MikgewotICAgICAg ICBwdXNoIEBidWlsZEFyZ3MsICItLWVuYWJsZS13ZWJraXQyIjsKLSAgICB9Ci0KICAgICAkcHJl Zml4ID0gJEVOVnsiV2ViS2l0SW5zdGFsbGF0aW9uUHJlZml4In0gaWYgIWRlZmluZWQoJHByZWZp eCk7CiAgICAgcHVzaCBAYnVpbGRBcmdzLCAiLS1wcmVmaXg9IiAuICRwcmVmaXggaWYgZGVmaW5l ZCgkcHJlZml4KTsKIApAQCAtMTk4OSwxMyArMTk4MywxMyBAQCBzdWIgYnVpbGRRTWFrZVF0UHJv amVjdCgkJEApCiAKIHN1YiBidWlsZEd0a1Byb2plY3QKIHsKLSAgICBteSAoJHByb2plY3QsICRj bGVhbiwgJGVuYWJsZVdlYktpdDIsIEBidWlsZEFyZ3MpID0gQF87CisgICAgbXkgKCRwcm9qZWN0 LCAkY2xlYW4sIEBidWlsZEFyZ3MpID0gQF87CiAKICAgICBpZiAoJHByb2plY3QgbmUgIldlYktp dCIgYW5kICRwcm9qZWN0IG5lICJKYXZhU2NyaXB0Q29yZSIpIHsKICAgICAgICAgZGllICJVbnN1 cHBvcnRlZCBwcm9qZWN0OiAkcHJvamVjdC4gU3VwcG9ydGVkIHByb2plY3RzOiBXZWJLaXQsIEph dmFTY3JpcHRDb3JlXG4iOwogICAgIH0KIAotICAgIHJldHVybiBidWlsZEF1dG90b29sc1Byb2pl Y3QoJHByb2plY3QsICRjbGVhbiwgJGVuYWJsZVdlYktpdDIsIEBidWlsZEFyZ3MpOworICAgIHJl dHVybiBidWlsZEF1dG90b29sc1Byb2plY3QoJHByb2plY3QsICRjbGVhbiwgQGJ1aWxkQXJncyk7 CiB9CiAKIHN1YiBidWlsZENocm9taXVtTWFrZWZpbGUoJCRAKQo= 119030 2011-12-13 09:57:48 -0800 2011-12-13 10:05:11 -0800 Patch which also prevents reconfiguration bug-74308-20111213095747.patch text/plain 6661 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyNjgyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNjZlOWU4ZDhhM2JiZmMxYjA5OTIxYTBlMDc5OGFmZWIz ZDNkZTMwOS4uMjBkZGI4MGZkYTYzOWJiYWM0ZmI4MjM1YWZhNjU1ZTA5MTU1N2ZmMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDExLTEyLTEzICBBbmR5IFdpbmdvICA8d2luZ29AaWdhbGlhLmNvbT4gYW5kIE1hcnRp biBSb2JpbnNvbiA8bXJvYmluc29uQGlnYWxpYS5jb20+CisKKyAgICAgICAgYnVpbGQtanNjIHBh c3NpbmcgaW5jb3JyZWN0IGFyZ3MgdG8gYnVpbGRHdGtQcm9qZWN0CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NDMwOAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWS4KKworICAgICAgICAqIFNjcmlwdHMvYnVpbGQtd2Via2l0OiBJbnN0ZWFkIG9m IGludm9raW5nIGJ1aWxkR3RrUHJvamVjdCB3aXRoCisgICAgICAgIGFub3RoZXIgYXJndW1lbnQg YWJvdXQgd2Via2l0MiwgdW5zaGlmdCBhIC0tZGlzYWJsZS13ZWJraXQyCisgICAgICAgIGFyZ3Vt ZW50IG9udG8gdGhlIGJ1aWxkQXJncy4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdGRpcnMucG06 IFJlbW92ZSAkZW5hYmxlV2ViS2l0MiBhcmcuIE9ubHkgc2F2ZSBhdXRvZ2VuLnNoCisgICAgICAg IGFyZ3VtZW50cyBmb3IgV2ViS2l0IHRvIHByZXZlbnQgdW5uZWNlc3NhcnkgcmVjb25maWd1cmF0 aW9uIHdoZW4gYnVsaWQtd2Via2l0CisgICAgICAgIGFuZCBidWxkLWpzYyBhcmUgcnVuIG9uZSBh ZnRlciB0aGUgb3RoZXIuCisKIDIwMTEtMTItMTMgIENzYWJhIE9zenRyb2dvbsOhYyAgPG9zc3lA d2Via2l0Lm9yZz4KIAogICAgICAgICBbUXRdIFVucmV2aWV3ZWQgc3BlY3VsYXRpdiBkZWJ1ZyBi dWlsZGZpeCBhZnRlciByMTAyNjc5LgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9idWlsZC13 ZWJraXQgYi9Ub29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAppbmRleCBlZWQyOGZmYTBhYzA1ZmM4 ZTU5M2Y2NjBiMzgyNGE3YjYzZTExNWYzLi5lN2RhZjI0Y2UzNzc4MDI2ZWNkMWI0YTQ4NTAzN2E3 YTY3NjBmOTBiIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAorKysgYi9U b29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdApAQCAtNzQ5LDcgKzc0OSwxMCBAQCBmb3IgbXkgJGRp ciAoQHByb2plY3RzKSB7CiAKICAgICBteSAkcHJvamVjdCA9IGJhc2VuYW1lKCRkaXIpOwogICAg IGlmIChpc0d0aygpKSB7Ci0gICAgICAgICRyZXN1bHQgPSBidWlsZEd0a1Byb2plY3QoJHByb2pl Y3QsICRjbGVhbiwgISRub1dlYktpdDIsIEBvcHRpb25zKTsKKyAgICAgICAgaWYgKCEkbm9XZWJL aXQyKSB7CisgICAgICAgICAgICB1bnNoaWZ0KEBvcHRpb25zLCAiLS1lbmFibGUtd2Via2l0MiIp OworICAgICAgICB9CisgICAgICAgICRyZXN1bHQgPSBidWlsZEd0a1Byb2plY3QoJHByb2plY3Qs ICRjbGVhbiwgQG9wdGlvbnMpOwogICAgIH0gZWxzaWYgKGlzUXQoKSkgewogICAgICAgICAjRklY TUU6ICRkaXIgc2hvdWxkIHByb2JhYmx5IGJlICRwcm9qZWN0LgogICAgICAgICAkcmVzdWx0ID0g YnVpbGRRTWFrZVF0UHJvamVjdCgkZGlyLCAkY2xlYW4sIEBvcHRpb25zKTsKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5w bQppbmRleCA4Y2VkNGYzYzkzZmIxOWY3ZDg5OWRmM2RlYmY4YjM2MmU3NmM4YzZkLi5mYzE3M2Jk NjQ3NWY0NzZhNGI3Y2M1MjA3ZGI5MTI0ZTk5NjE5YmQ5IDEwMDc1NQotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdGRpcnMucG0KKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCkBAIC0x NTgwLDkgKzE1ODAsMjMgQEAgc3ViIGdldE1ENUhhc2hGb3JGaWxlKCQpCiAgICAgcmV0dXJuIG1k NV9oZXgoJGNvbnRlbnRzKTsKIH0KIAotc3ViIHJ1bkF1dG9nZW5Gb3JBdXRvdG9vbHNQcm9qZWN0 KCRAKQorc3ViIHJ1bkF1dG9nZW5Gb3JBdXRvdG9vbHNQcm9qZWN0SWZOZWNlc3NhcnkoJEApCiB7 Ci0gICAgbXkgKCRkaXIsICRwcmVmaXgsICRzb3VyY2VEaXIsICRzYXZlQXJndW1lbnRzLCAkYXJn dW1lbnRzRmlsZSwgQGJ1aWxkQXJncykgPSBAXzsKKyAgICBteSAoJGRpciwgJHByZWZpeCwgJHNv dXJjZURpciwgJHByb2plY3QsIEBidWlsZEFyZ3MpID0gQF87CisKKyAgICBteSAkYXJndW1lbnRz RmlsZSA9ICJwcmV2aW91cy1hdXRvZ2VuLWFyZ3VtZW50cy50eHQiOworICAgIGlmICgtZSAiR05V bWFrZWZpbGUiKSB7CisgICAgICAgICMgSnVzdCBhc3N1bWUgdGhhdCBidWlsZC1qc2Mgd2lsbCBu ZXZlciBiZSB1c2VkIHRvIHJlY29uZmlndXJlIEpTQy4gTGF0ZXIKKyAgICAgICAgIyB3ZSBjYW4g Z28gYmFjayBhbmQgbWFrZSB0aGlzIG1vcmUgY29tcGxpY2F0ZWQgaWYgdGhlIGRlbWFuZCBpcyB0 aGVyZS4KKyAgICAgICAgaWYgKCRwcm9qZWN0IG5lICJXZWJLaXQiKSB7CisgICAgICAgICAgICBy ZXR1cm47CisgICAgICAgIH0KKworICAgICAgICAjIFdlIG9ubHkgcnVuIGF1dG9nZW4uc2ggYWdh aW4gaWYgdGhlIGFyZ3VtZW50cyBwYXNzZWQgaGF2ZSBjaGFuZ2VkLgorICAgICAgICBpZiAoIW11 c3RSZVJ1bkF1dG9nZW4oJHNvdXJjZURpciwgJGFyZ3VtZW50c0ZpbGUsIEBidWlsZEFyZ3MpKSB7 CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICB9CiAKICAgICBwcmludCAiQ2Fs bGluZyBhdXRvZ2VuLnNoIGluICIgLiAkZGlyIC4gIlxuXG4iOwogICAgIHByaW50ICJJbnN0YWxs YXRpb24gcHJlZml4IGRpcmVjdG9yeTogJHByZWZpeFxuIiBpZihkZWZpbmVkKCRwcmVmaXgpKTsK QEAgLTE1OTUsOSArMTYwOSw5IEBAIHN1YiBydW5BdXRvZ2VuRm9yQXV0b3Rvb2xzUHJvamVjdCgk QCkKICAgICAgICAgY2xvc2UoU1VNKTsKICAgICB9CiAKLSAgICBpZiAoJHNhdmVBcmd1bWVudHMp IHsKLSAgICAgICAgIyBXcml0ZSBhdXRvZ2VuLnNoIGFyZ3VtZW50cyB0byBhIGZpbGUgc28gdGhh dCB3ZSBjYW4gZGV0ZWN0Ci0gICAgICAgICMgd2hlbiB0aGV5IGNoYW5nZSBhbmQgYXV0b21hdGlj YWxseSByZS1ydW4gaXQuCisgICAgIyBPbmx5IGZvciBXZWJLaXQsIHdyaXRlIHRoZSBhdXRvZ2Vu LnNoIGFyZ3VtZW50cyB0byBhIGZpbGUgc28gdGhhdCB3ZSBjYW4gZGV0ZWN0CisgICAgIyB3aGVu IHRoZXkgY2hhbmdlIGFuZCBhdXRvbWF0aWNhbGx5IHJlLXJ1biBpdC4KKyAgICBpZiAoJHByb2pl Y3QgZXEgJ1dlYktpdCcpIHsKICAgICAgICAgb3BlbihBVVRPVE9PTFNfQVJHVU1FTlRTLCAiPiRh cmd1bWVudHNGaWxlIik7CiAgICAgICAgIHByaW50IEFVVE9UT09MU19BUkdVTUVOVFMgam9pbigi ICIsIEBidWlsZEFyZ3MpOwogICAgICAgICBjbG9zZShBVVRPVE9PTFNfQVJHVU1FTlRTKTsKQEAg LTE2MjcsNiArMTY0MSwxMCBAQCBzdWIgbXVzdFJlUnVuQXV0b2dlbigkQCkKICAgICBjaG9tcCht eSAkcHJldmlvdXNBcmd1bWVudHMgPSA8QVVUT1RPT0xTX0FSR1VNRU5UUz4pOwogICAgIGNsb3Nl KEFVVE9UT09MU19BUkdVTUVOVFMpOwogCisgICAgIyBXZSBvbmx5IGNhcmUgYWJvdXQgdGhlIFdl YktpdDIgYXJndW1lbnQgd2hlbiB3ZSBhcmUgYnVpbGRpbmcgV2ViS2l0IGl0c2VsZi4KKyAgICAj IGJ1aWxkLWpzYyBuZXZlciBwYXNzZXMgLS1lbmFibGUtd2Via2l0Miwgc28gaWYgd2UgZGlkbid0 IGRvIHRoaXMsIGF1dG9nZW4uc2gKKyAgICAjIHdvdWxkIHJ1biBmb3IgZXZlcnkgc2luZ2xlIGJ1 aWxkIG9uIHRoZSBib3RzLCBzaW5jZSBpdCBydW5zIGJvdGggYnVpbGQtd2Via2l0CisgICAgIyBh bmQgYnVpbGQtanNjLgogICAgIG15ICRqb2luZWRDdXJyZW50QXJndW1lbnRzID0gam9pbigiICIs IEBjdXJyZW50QXJndW1lbnRzKTsKICAgICBpZiAoJHByZXZpb3VzQXJndW1lbnRzIG5lICRqb2lu ZWRDdXJyZW50QXJndW1lbnRzKSB7CiAgICAgICAgIHByaW50ICJQcmV2aW91cyBhdXRvZ2VuIGFy Z3VtZW50cyB3ZXJlOiAkcHJldmlvdXNBcmd1bWVudHNcblxuIjsKQEAgLTE2NjAsNyArMTY3OCw3 IEBAIHN1YiBtdXN0UmVSdW5BdXRvZ2VuKCRAKQogCiBzdWIgYnVpbGRBdXRvdG9vbHNQcm9qZWN0 KCRAKQogewotICAgIG15ICgkcHJvamVjdCwgJGNsZWFuLCAkZW5hYmxlV2ViS2l0MiwgQGJ1aWxk UGFyYW1zKSA9IEBfOworICAgIG15ICgkcHJvamVjdCwgJGNsZWFuLCBAYnVpbGRQYXJhbXMpID0g QF87CiAKICAgICBteSAkbWFrZSA9ICdtYWtlJzsKICAgICBteSAkZGlyID0gcHJvZHVjdERpcigp OwpAQCAtMTY5MSwxMiArMTcwOSw2IEBAIHN1YiBidWlsZEF1dG90b29sc1Byb2plY3QoJEApCiAg ICAgICAgICRtYWtlQXJncyAuPSAiIGpzYyI7CiAgICAgfQogCi0gICAgIyBUaGlzIGlzIGEgdGVt cG9yYXJ5IHdvcmstYXJvdW5kIHRvIGVuYWJsZSBidWlsZGluZyBXZWJLaXQyIG9uIHRoZSBib3Rz LAotICAgICMgYnV0IGVuc3VyaW5nIHRoYXQgaXQgZG9lcyBub3Qgc2hpcCB1bnRpbCB0aGUgQVBJ IGlzIHN0YWJsZS4KLSAgICBpZiAoJHByb2plY3QgZXEgIldlYktpdCIgYW5kIGlzR3RrKCkgYW5k ICRlbmFibGVXZWJLaXQyKSB7Ci0gICAgICAgIHB1c2ggQGJ1aWxkQXJncywgIi0tZW5hYmxlLXdl YmtpdDIiOwotICAgIH0KLQogICAgICRwcmVmaXggPSAkRU5WeyJXZWJLaXRJbnN0YWxsYXRpb25Q cmVmaXgifSBpZiAhZGVmaW5lZCgkcHJlZml4KTsKICAgICBwdXNoIEBidWlsZEFyZ3MsICItLXBy ZWZpeD0iIC4gJHByZWZpeCBpZiBkZWZpbmVkKCRwcmVmaXgpOwogCkBAIC0xNzI1LDE1ICsxNzM3 LDcgQEAgc3ViIGJ1aWxkQXV0b3Rvb2xzUHJvamVjdCgkQCkKICAgICAjIElmIEdOVW1ha2VmaWxl IGV4aXN0cywgZG9uJ3QgcnVuIGF1dG9nZW4uc2ggdW5sZXNzIGl0cyBhcmd1bWVudHMKICAgICAj IGhhdmUgY2hhbmdlZC4gVGhlIG1ha2VmaWxlIHNob3VsZCBiZSBzbWFydCBlbm91Z2ggdG8gdHJh Y2sgYXV0b3Rvb2xzCiAgICAgIyBkZXBlbmRlbmNpZXMgYW5kIHJlLXJ1biBhdXRvZ2VuLnNoIHdo ZW4gYnVpbGQgZmlsZXMgY2hhbmdlLgotICAgIG15ICRhdXRvZ2VuQXJndW1lbnRzRmlsZSA9ICJw cmV2aW91cy1hdXRvZ2VuLWFyZ3VtZW50cy50eHQiOwotICAgIG15ICRidWlsZGluZ1dlYktpdCA9 ICRwcm9qZWN0IGVxICJXZWJLaXQiOwotICAgIGlmICghKC1lICJHTlVtYWtlZmlsZSIpKSB7Ci0g ICAgICAgIHJ1bkF1dG9nZW5Gb3JBdXRvdG9vbHNQcm9qZWN0KCRkaXIsICRwcmVmaXgsICRzb3Vy Y2VEaXIsICRidWlsZGluZ1dlYktpdCwgJGF1dG9nZW5Bcmd1bWVudHNGaWxlLCBAYnVpbGRBcmdz KTsKLSAgICB9Ci0KLSAgICBpZiAoJGJ1aWxkaW5nV2ViS2l0IGFuZCBtdXN0UmVSdW5BdXRvZ2Vu KCRzb3VyY2VEaXIsICRhdXRvZ2VuQXJndW1lbnRzRmlsZSwgQGJ1aWxkQXJncykpIHsKLSAgICAg ICAgcnVuQXV0b2dlbkZvckF1dG90b29sc1Byb2plY3QoJGRpciwgJHByZWZpeCwgJHNvdXJjZURp ciwgJGJ1aWxkaW5nV2ViS2l0LCAkYXV0b2dlbkFyZ3VtZW50c0ZpbGUsIEBidWlsZEFyZ3MpOwot ICAgIH0KKyAgICBydW5BdXRvZ2VuRm9yQXV0b3Rvb2xzUHJvamVjdElmTmVjZXNzYXJ5KCRkaXIs ICRwcmVmaXgsICRzb3VyY2VEaXIsICRwcm9qZWN0LCBAYnVpbGRBcmdzKTsKIAogICAgIG15ICRn dGtTY3JpcHRzUGF0aCA9ICIkc291cmNlRGlyL1Rvb2xzL2d0ayI7CiAgICAgbXkgJHJ1bldpdGhK aGJ1aWxkID0gIiRndGtTY3JpcHRzUGF0aC9ydW4td2l0aC1qaGJ1aWxkIjsKQEAgLTE3NDMsNyAr MTc0Nyw3IEBAIHN1YiBidWlsZEF1dG90b29sc1Byb2plY3QoJEApCiAKICAgICBjaGRpciAiLi4i IG9yIGRpZTsKIAotICAgIGlmICgkYnVpbGRpbmdXZWJLaXQpIHsKKyAgICBpZiAoJHByb2plY3Qg ZXEgJ1dlYktpdCcpIHsKICAgICAgICAgbXkgQGRvY0dlbmVyYXRpb25PcHRpb25zID0gKCRydW5X aXRoSmhidWlsZCwgIiRndGtTY3JpcHRzUGF0aC9nZW5lcmF0ZS1ndGtkb2MiLCAiLS1za2lwLWh0 bWwiKTsKICAgICAgICAgaWYgKCRkZWJ1ZykgewogICAgICAgICAgICAgcHVzaChAZG9jR2VuZXJh dGlvbk9wdGlvbnMsICItLWRlYnVnIik7CkBAIC0xOTg5LDEzICsxOTkzLDEzIEBAIHN1YiBidWls ZFFNYWtlUXRQcm9qZWN0KCQkQCkKIAogc3ViIGJ1aWxkR3RrUHJvamVjdAogewotICAgIG15ICgk cHJvamVjdCwgJGNsZWFuLCAkZW5hYmxlV2ViS2l0MiwgQGJ1aWxkQXJncykgPSBAXzsKKyAgICBt eSAoJHByb2plY3QsICRjbGVhbiwgQGJ1aWxkQXJncykgPSBAXzsKIAogICAgIGlmICgkcHJvamVj dCBuZSAiV2ViS2l0IiBhbmQgJHByb2plY3QgbmUgIkphdmFTY3JpcHRDb3JlIikgewogICAgICAg ICBkaWUgIlVuc3VwcG9ydGVkIHByb2plY3Q6ICRwcm9qZWN0LiBTdXBwb3J0ZWQgcHJvamVjdHM6 IFdlYktpdCwgSmF2YVNjcmlwdENvcmVcbiI7CiAgICAgfQogCi0gICAgcmV0dXJuIGJ1aWxkQXV0 b3Rvb2xzUHJvamVjdCgkcHJvamVjdCwgJGNsZWFuLCAkZW5hYmxlV2ViS2l0MiwgQGJ1aWxkQXJn cyk7CisgICAgcmV0dXJuIGJ1aWxkQXV0b3Rvb2xzUHJvamVjdCgkcHJvamVjdCwgJGNsZWFuLCBA YnVpbGRBcmdzKTsKIH0KIAogc3ViIGJ1aWxkQ2hyb21pdW1NYWtlZmlsZSgkJEApCg==