22515 2008-11-26 13:28:05 -0800 build-webkit --chromium should build Chromium's WebKit port 2008-11-26 17:40:39 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric webkit-unassigned oldest_to_newest 100436 0 eric 2008-11-26 13:28:05 -0800 build-webkit --chromium should build Chromium's WebKit port In order to be good webkit citizens, we should fully integrate with the rest of the WebKit build system. So build-webkit should "just work" for chromium, along with all the other tools. This will take a few rounds of patches. This bug will cover getting "build-webkit --chromium" up and working on at least mac. 100439 1 25531 eric 2008-11-26 13:45:03 -0800 Created attachment 25531 Rename isOSX to isAppleMacWebKit to match what the code does, and add isChromium WebKitTools/ChangeLog | 16 ++++++ WebKitTools/Scripts/build-dumprendertree | 2 +- WebKitTools/Scripts/build-jsc | 2 +- WebKitTools/Scripts/build-webkit | 29 +++++------ WebKitTools/Scripts/gdb-safari | 2 +- WebKitTools/Scripts/run-javascriptcore-tests | 4 +- WebKitTools/Scripts/run-webkit-tests | 14 +++--- WebKitTools/Scripts/webkitdirs.pm | 72 +++++++++++++++++--------- 8 files changed, 89 insertions(+), 52 deletions(-) 100440 2 25532 eric 2008-11-26 13:45:04 -0800 Created attachment 25532 Change a few calls to isCygwin to isAppleWinWebKit and isAppleMacWebKit to isDarwin in preperation for a --chromium build WebCore/WebCore.xcodeproj/project.pbxproj | 3 +- WebKitTools/ChangeLog | 12 +++++++++++ WebKitTools/Scripts/build-webkit | 10 ++++---- WebKitTools/Scripts/webkitdirs.pm | 30 ++++++++++++++-------------- 4 files changed, 34 insertions(+), 21 deletions(-) 100441 3 25533 eric 2008-11-26 13:45:06 -0800 Created attachment 25533 Add support for build-webkit --chromium WebKitTools/ChangeLog | 11 +++++++ WebKitTools/Scripts/build-webkit | 8 ++++- WebKitTools/Scripts/webkitdirs.pm | 60 +++++++++++++++++------------------- 3 files changed, 46 insertions(+), 33 deletions(-) 100447 4 25536 eric 2008-11-26 14:27:05 -0800 Created attachment 25536 More cleanups changing isCygwin calls to isAppleWinWebKit and deploying isAppleWebKit where necessary. WebKitTools/ChangeLog | 15 +++++++++++++++ WebKitTools/Scripts/build-dumprendertree | 2 +- WebKitTools/Scripts/build-jsc | 2 +- WebKitTools/Scripts/build-webkit | 4 ++-- WebKitTools/Scripts/run-webkit-tests | 4 ++-- WebKitTools/Scripts/webkitdirs.pm | 4 ++-- 6 files changed, 23 insertions(+), 8 deletions(-) 100463 5 25531 zimmermann 2008-11-26 15:23:02 -0800 Comment on attachment 25531 Rename isOSX to isAppleMacWebKit to match what the code does, and add isChromium Looks sane. r=me. 100467 6 25532 zimmermann 2008-11-26 15:47:38 -0800 Comment on attachment 25532 Change a few calls to isCygwin to isAppleWinWebKit and isAppleMacWebKit to isDarwin in preperation for a --chromium build I'm not sure the project.pbxproj changes are relevant? Please remove, then r=me. 100469 7 25536 zimmermann 2008-11-26 15:49:32 -0800 Comment on attachment 25536 More cleanups changing isCygwin calls to isAppleWinWebKit and deploying isAppleWebKit where necessary. All patches looks sane. 100477 8 mrowe 2008-11-26 16:10:38 -0800 There doesn't seem to be any logic as to which changes are in each patch. One of the earlier patches changes a bunch of isOSX to isAppleMacWebKit, which a later patch then changes to isDarwin. It would be much clearer to change things directly from isOSX to isDarwin if they were incorrect. Overall these just feel like four commits to save your place along the way as you were working rather than logical, discrete patches to land in SVN. 100495 9 eric 2008-11-26 17:40:39 -0800 Landed. 25531 2008-11-26 13:45:03 -0800 2008-11-26 15:23:02 -0800 Rename isOSX to isAppleMacWebKit to match what the code does, and add isChromium Rename-isOSX-to-isAppleMacWebKit-to-match-what-the-code-does-and-add-isChromium.patch text/plain 15279 eric ZGI3MDkxYjRkYTljZTVjMTgyM2I3MGUyOGNkNjQ0MzM4YzZjNzNhOApkaWZmIC0tZ2l0IGEvV2Vi S2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCmluZGV4IGQ3NjU5MDAu LmJkZjEzYzUgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZworKysgYi9XZWJLaXRU b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAwOC0xMS0yNiAgRXJpYyBTZWlkZWwg IDxlcmljQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgUHJlLXdvcmsgZm9yIGdldHRpbmcgYnVpbGQtd2Via2l0IC0tY2hyb21pdW0g dG8gd29yaworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjI1MTUKKyAgICAgICAgUmVuYW1lIGlzT1NYIHRvIGlzQXBwbGVNYWNXZWJLaXQgdG8gbWF0Y2gg d2hhdCB0aGUgY29kZSBkb2VzLCBhbmQgYWRkIGlzQ2hyb21pdW0oKQorCisgICAgICAgICogU2Ny aXB0cy9idWlsZC1kdW1wcmVuZGVydHJlZToKKyAgICAgICAgKiBTY3JpcHRzL2J1aWxkLWpzYzoK KyAgICAgICAgKiBTY3JpcHRzL2J1aWxkLXdlYmtpdDoKKyAgICAgICAgKiBTY3JpcHRzL2dkYi1z YWZhcmk6CisgICAgICAgICogU2NyaXB0cy9ydW4tamF2YXNjcmlwdGNvcmUtdGVzdHM6CisgICAg ICAgICogU2NyaXB0cy9ydW4td2Via2l0LXRlc3RzOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0 ZGlycy5wbToKKwogMjAwOC0xMS0yNiAgSmFuIE1pY2hhZWwgQWxvbnpvICA8am1hbG9uem9Ad2Vi a2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBIb2xnZXIgRnJleXRoZXIuCmRpZmYgLS1n aXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL2J1aWxkLWR1bXByZW5kZXJ0cmVlIGIvV2ViS2l0VG9v bHMvU2NyaXB0cy9idWlsZC1kdW1wcmVuZGVydHJlZQppbmRleCBhMTE0ODFiLi5kMjA2MDVmIDEw MDc1NQotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL2J1aWxkLWR1bXByZW5kZXJ0cmVlCisrKyBi L1dlYktpdFRvb2xzL1NjcmlwdHMvYnVpbGQtZHVtcHJlbmRlcnRyZWUKQEAgLTQxLDcgKzQxLDcg QEAgbXkgQG9wdGlvbnMgPSBYY29kZU9wdGlvbnMoKTsKICMgQnVpbGQKIGNoZGlyICJXZWJLaXRU b29scy9EdW1wUmVuZGVyVHJlZSIgb3IgZGllOwogbXkgJHJlc3VsdDsKLWlmIChpc09TWCgpKSB7 CitpZiAoaXNBcHBsZU1hY1dlYktpdCgpKSB7CiAgICAgJHJlc3VsdCA9IHN5c3RlbSAieGNvZGVi dWlsZCIsICItcHJvamVjdCIsICJEdW1wUmVuZGVyVHJlZS54Y29kZXByb2oiLCBAb3B0aW9ucywg QEFSR1Y7CiB9IGVsc2lmIChpc0N5Z3dpbigpKSB7CiAgICAgJHJlc3VsdCA9IGJ1aWxkVmlzdWFs U3R1ZGlvUHJvamVjdCgiRHVtcFJlbmRlclRyZWUuc2xuIik7CmRpZmYgLS1naXQgYS9XZWJLaXRU b29scy9TY3JpcHRzL2J1aWxkLWpzYyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVpbGQtanNjCmlu ZGV4IGYyNThlYTUuLjg5MDkwYjIgMTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVp bGQtanNjCisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVpbGQtanNjCkBAIC00MSw3ICs0MSw3 IEBAIG15IEBvcHRpb25zID0gWGNvZGVPcHRpb25zKCk7CiAKIGNoZGlyICJKYXZhU2NyaXB0Q29y ZSIgb3IgZGllICJDYW4ndCBmaW5kIEphdmFTY3JpcHRDb3JlIGRpcmVjdG9yeSB0byBidWlsZCBm cm9tIjsKIG15ICRyZXN1bHQ7Ci1pZiAoaXNPU1goKSkgeworaWYgKGlzQXBwbGVNYWNXZWJLaXQo KSkgewogICAgICRyZXN1bHQgPSBzeXN0ZW0gInNoIiwgIi1jIiwgJ3hjb2RlYnVpbGQgLXByb2pl Y3QgSmF2YVNjcmlwdENvcmUueGNvZGVwcm9qIC10YXJnZXQganNjICIkQCIgfCBncmVwIC12IHNl dGVudiAmJiBleGl0ICR7UElQRVNUQVRVU1swXX0nLCAieGNvZGVidWlsZCIsICBAb3B0aW9ucywg QEFSR1Y7CiB9IGVsc2lmIChpc0N5Z3dpbigpKSB7CiAgICAgJHJlc3VsdCA9IGJ1aWxkVmlzdWFs U3R1ZGlvUHJvamVjdCgiSmF2YVNjcmlwdENvcmUudmNwcm9qL0phdmFTY3JpcHRDb3JlLnNsbiIp OwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQgYi9XZWJLaXRU b29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAppbmRleCAxZWE0MDJkLi5jMTU0MmRiIDEwMDc1NQot LS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAorKysgYi9XZWJLaXRUb29scy9T Y3JpcHRzL2J1aWxkLXdlYmtpdApAQCAtNTYsOCArNTYsOCBAQCBteSAkeHBhdGhTdXBwb3J0ID0g MTsKIG15ICR4c2x0U3VwcG9ydCA9IDE7CiBteSAkd21sU3VwcG9ydCA9IDA7CiBteSAkY292ZXJh Z2VTdXBwb3J0ID0gMDsKLW15ICR2aWRlb1N1cHBvcnQgPSAoaXNPU1goKSB8fCBpc0N5Z3dpbigp KTsgIyBFbmFibGUgYnkgZGVmYXVsdCBvbiBPU1ggYW5kIFdpbmRvd3MKLW15ICR3b3JrZXJzU3Vw cG9ydCA9IChpc09TWCgpIHx8IGlzQ3lnd2luKCkgfHwgaXNHdGsoKSk7ICMgRW5hYmxlIGJ5IGRl ZmF1bHQgb24gT1NYLCBXaW5kb3dzIGFuZCBHdGsrCitteSAkdmlkZW9TdXBwb3J0ID0gKGlzQXBw bGVNYWNXZWJLaXQoKSB8fCBpc0N5Z3dpbigpKTsgIyBFbmFibGUgYnkgZGVmYXVsdCBvbiBPU1gg YW5kIFdpbmRvd3MKK215ICR3b3JrZXJzU3VwcG9ydCA9IChpc0FwcGxlTWFjV2ViS2l0KCkgfHwg aXNDeWd3aW4oKSB8fCBpc0d0aygpKTsgIyBFbmFibGUgYnkgZGVmYXVsdCBvbiBPU1gsIFdpbmRv d3MgYW5kIEd0aysKIG15ICRzaG93SGVscCA9IDA7CiBteSAkY2xlYW4gPSAwOwogbXkgJGJ1aWxk VW5pdmVyc2FsID0gMDsKQEAgLTIwMiwxMiArMjAyLDEyIEBAIGZvciBteSAkZGlyIChAcHJvamVj dHMsIEBvdGhlckRpcnMpIHsKIAogbXkgQG9wdGlvbnMgPSAoKTsKIAotaWYgKCRjbGVhbiAmJiBp c09TWCgpKSB7CitpZiAoJGNsZWFuICYmIGlzQXBwbGVNYWNXZWJLaXQoKSkgewogICAgIHB1c2go QG9wdGlvbnMsICItYWxsdGFyZ2V0cyIpOwogICAgIHB1c2goQG9wdGlvbnMsICJjbGVhbiIpOwog fQogCi1pZiAoJGJ1aWxkU2l4dHlGb3VyQml0ICYmIGlzT1NYKCkpIHsKK2lmICgkYnVpbGRTaXh0 eUZvdXJCaXQgJiYgaXNBcHBsZU1hY1dlYktpdCgpKSB7CiAgICAgbXkgJGNwdVZlbmRvciA9IGBz eXNjdGwgLW4gbWFjaGRlcC5jcHUudmVuZG9yYDsKICAgICBjaG9tcCAkY3B1VmVuZG9yOwogCkBA IC0yMTgsNyArMjE4LDcgQEAgaWYgKCRidWlsZFNpeHR5Rm91ckJpdCAmJiBpc09TWCgpKSB7CiAg ICAgfSBlbHNlIHsKICAgICAgICAgcHVzaChAb3B0aW9ucywgIkFSQ0hTPXBwYyBwcGM2NCIpOwog ICAgIH0KLX0gZWxzaWYgKCRidWlsZFVuaXZlcnNhbCAmJiBpc09TWCgpKSB7Cit9IGVsc2lmICgk YnVpbGRVbml2ZXJzYWwgJiYgaXNBcHBsZU1hY1dlYktpdCgpKSB7CiAgICAgcHVzaChAb3B0aW9u cywgIkFSQ0hTPXBwYyBpMzg2Iik7CiB9CiAKQEAgLTI0Myw3ICsyNDMsNyBAQCBpZiAoaXNHdGso KSkgewogICAgIHB1c2ggQG9wdGlvbnMsIGF1dG90b29sc0ZsYWcoJGNvdmVyYWdlU3VwcG9ydCwg ImNvdmVyYWdlIik7CiB9CiAKLWlmIChpc09TWCgpKSB7CitpZiAoaXNBcHBsZU1hY1dlYktpdCgp KSB7CiAKICAgICBwdXNoKEBvcHRpb25zLCBYY29kZU9wdGlvbnMoKSk7CiAKQEAgLTMwMiwyMCAr MzAyLDE3IEBAIGZvciBteSAkZGlyIChAcHJvamVjdHMpIHsKICAgICBjaGRpciAkZGlyIG9yIGRp ZTsKICAgICBteSAkcmVzdWx0ID0gMDsKIAotICAgIGlmIChpc0d0aygpKSB7Ci0gICAgICAgIGlm ICgkZGlyIG5lICJXZWJLaXQiKSB7Ci0gICAgICAgICAgICBjaGRpciAiLi4iIG9yIGRpZTsKLSAg ICAgICAgICAgIG5leHQ7Ci0gICAgICAgIH0KKyAgICAjIEZvciBHdGsgYW5kIFF0IHRoZSBXZWJL aXQgcHJvamVjdCBidWlsZHMgYWxsIG90aGVycworICAgIGlmICgoaXNHdGsoKSB8fCBpc1F0KCkp ICYmICRkaXIgbmUgIldlYktpdCIpIHsKKyAgICAgICAgY2hkaXIgIi4uIiBvciBkaWU7CisgICAg ICAgIG5leHQ7CisgICAgfQogCisgICAgaWYgKGlzR3RrKCkpIHsKICAgICAgICAgJHJlc3VsdCA9 IGJ1aWxkR3RrUHJvamVjdCgkZGlyLCAkY2xlYW4sICBAb3B0aW9ucyk7CiAgICAgfSBlbHNpZiAo aXNRdCgpKSB7Ci0gICAgICAgIGlmICgkZGlyIG5lICJXZWJLaXQiKSB7Ci0gICAgICAgICAgICBj aGRpciAiLi4iIG9yIGRpZTsKLSAgICAgICAgICAgIG5leHQ7Ci0gICAgICAgIH0KICAgICAgICAg JHJlc3VsdCA9IGJ1aWxkUU1ha2VRdFByb2plY3QoJGRpciwgJGNsZWFuLCBAQVJHVik7Ci0gICAg fSBlbHNpZiAoaXNPU1goKSkgeworICAgIH0gZWxzaWYgKGlzQXBwbGVNYWNXZWJLaXQoKSkgewog ICAgICAgICAkcmVzdWx0ID0gc3lzdGVtICJ4Y29kZWJ1aWxkIiwgIi1wcm9qZWN0IiwgIiRkaXIu eGNvZGVwcm9qIiwgQG9wdGlvbnMsICRvdmVycmlkZUZlYXR1cmVEZWZpbmVzU3RyaW5nLCBAY292 ZXJhZ2VTdXBwb3J0T3B0aW9uLCBAQVJHVjsKICAgICB9IGVsc2lmIChpc0N5Z3dpbigpKSB7CiAg ICAgICAgIGlmICgkZGlyIGVxICJXZWJLaXQiKSB7CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9T Y3JpcHRzL2dkYi1zYWZhcmkgYi9XZWJLaXRUb29scy9TY3JpcHRzL2dkYi1zYWZhcmkKaW5kZXgg ZDBmNTY4Yy4uZjhmMGJmNiAxMDA3NTUKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9nZGItc2Fm YXJpCisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvZ2RiLXNhZmFyaQpAQCAtNzQsNyArNzQsNyBA QCBteSAoJGZoLCAkcGF0aCkgPSBta3N0ZW1wKCIvdG1wL2dkYi1zYWZhcmktWFhYWCIpOwogcHJp bnQgJGZoICJzZXQgZW52IERZTERfRlJBTUVXT1JLX1BBVEggJHByb2R1Y3REaXJcbiI7CiBwcmlu dCAkZmggInNldCBlbnYgV0VCS0lUX1VOU0VUX0RZTERfRlJBTUVXT1JLX1BBVEggWUVTXG4iOwog Ci1teSBAYXJjaGl0ZWN0dXJlRmxhZ3MgPSAoIi1hcmNoIiwgcHJlZmVycmVkQXJjaGl0ZWN0dXJl KCkpIGlmIGlzT1NYKCk7CitteSBAYXJjaGl0ZWN0dXJlRmxhZ3MgPSAoIi1hcmNoIiwgcHJlZmVy cmVkQXJjaGl0ZWN0dXJlKCkpIGlmIGlzQXBwbGVNYWNXZWJLaXQoKTsKICMgU3RhcnQgdXAgU2Fm YXJpLgogcHJpbnQgIlN0YXJ0IFNhZmFyaSB1bmRlciBnZGIgd2l0aCBEWUxEX0ZSQU1FV09SS19Q QVRIIHNldCB0byBwb2ludCB0byBidWlsdCBXZWJLaXQgaW4gJHByb2R1Y3REaXIuXG4iOwogZXhl YyAkZ2RiUGF0aCwgIi14IiwgJHBhdGgsIEBhcmNoaXRlY3R1cmVGbGFncywgJHNhZmFyaVBhdGgg b3IgZGllOwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9ydW4tamF2YXNjcmlwdGNv cmUtdGVzdHMgYi9XZWJLaXRUb29scy9TY3JpcHRzL3J1bi1qYXZhc2NyaXB0Y29yZS10ZXN0cwpp bmRleCBhZmQwYWI0Li5jODVkOTY5IDEwMDc1NQotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3J1 bi1qYXZhc2NyaXB0Y29yZS10ZXN0cworKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3J1bi1qYXZh c2NyaXB0Y29yZS10ZXN0cwpAQCAtNzksNyArNzksNyBAQCBmb3JlYWNoIG15ICRhcmcoQEFSR1Yp IHsKIAogc2V0Q29uZmlndXJhdGlvblByb2R1Y3REaXIoQ3dkOjphYnNfcGF0aCgkcm9vdCkpIGlm IChkZWZpbmVkKCRyb290KSk7CiAKLWlmIChpc09TWCgpICYmICFpc1RpZ2VyKCkpIHsKK2lmIChp c0FwcGxlTWFjV2ViS2l0KCkgJiYgIWlzVGlnZXIoKSkgewogICAgIG15ICRwcmVmZXJyZWRBcmNo ID0gcHJlZmVycmVkQXJjaGl0ZWN0dXJlKCJKYXZhU2NyaXB0Q29yZSIpOwogICAgIHNldFJ1bjY0 Qml0KCRydW42NEJpdCk7CiAgICAgbXkgJGFyY2ggPSBwcmVmZXJyZWRBcmNoaXRlY3R1cmUoIkph dmFTY3JpcHRDb3JlIik7CkBAIC05OCw3ICs5OCw3IEBAIGlmKCFkZWZpbmVkKCRyb290KSl7CiAg ICAgcHVzaChAeGNvZGVBcmdzLCAiLS13eCIpICBpZiBpc1d4KCk7CiAKICAgICBteSAkYXJjaCA9 IHByZWZlcnJlZEFyY2hpdGVjdHVyZSgiSmF2YVNjcmlwdENvcmUiKTsKLSAgICBwdXNoKEB4Y29k ZUFyZ3MsICJBUkNIUz0kYXJjaCIpIGlmIChpc09TWCgpKTsKKyAgICBwdXNoKEB4Y29kZUFyZ3Ms ICJBUkNIUz0kYXJjaCIpIGlmIChpc0FwcGxlTWFjV2ViS2l0KCkpOwogICAgIAogICAgIG15ICRi dWlsZFJlc3VsdCA9IHN5c3RlbSAicGVybCIsICJXZWJLaXRUb29scy9TY3JpcHRzL2J1aWxkLWpz YyIsIEB4Y29kZUFyZ3M7CiAgICAgaWYgKCRidWlsZFJlc3VsdCkgewpkaWZmIC0tZ2l0IGEvV2Vi S2l0VG9vbHMvU2NyaXB0cy9ydW4td2Via2l0LXRlc3RzIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9y dW4td2Via2l0LXRlc3RzCmluZGV4IGYwOTQ0MjEuLjc3MmI0NjQgMTAwNzU1Ci0tLSBhL1dlYktp dFRvb2xzL1NjcmlwdHMvcnVuLXdlYmtpdC10ZXN0cworKysgYi9XZWJLaXRUb29scy9TY3JpcHRz L3J1bi13ZWJraXQtdGVzdHMKQEAgLTE1Myw3ICsxNTMsNyBAQCBpZiAoaXNUaWdlcigpKSB7CiB9 IGVsc2lmIChpc1Nub3dMZW9wYXJkKCkpIHsKICAgICAkcGxhdGZvcm0gPSAibWFjLXNub3dsZW9w YXJkIjsKICAgICAkdG9sZXJhbmNlID0gMC4xOwotfSBlbHNpZiAoaXNPU1goKSkgeworfSBlbHNp ZiAoaXNBcHBsZU1hY1dlYktpdCgpKSB7CiAgICAgJHBsYXRmb3JtID0gIm1hYyI7CiB9IGVsc2lm IChpc1F0KCkpIHsKICAgICAkcGxhdGZvcm0gPSAicXQiOwpAQCAtMjkwLDcgKzI5MCw3IEBAIGlm ICghZGVmaW5lZCgkcm9vdCkpIHsKICAgICBwdXNoKEBhcmdzLCAiLS1xdCIpICBpZiBpc1F0KCk7 CiAgICAgcHVzaChAYXJncywgIi0tZ3RrIikgIGlmIGlzR3RrKCk7CiAKLSAgICBpZiAoaXNPU1go KSkgeworICAgIGlmIChpc0FwcGxlTWFjV2ViS2l0KCkpIHsKICAgICAgICAgbXkgJGFyY2ggPSBw cmVmZXJyZWRBcmNoaXRlY3R1cmUoKTsKICAgICAgICAgcHVzaChAYXJncywgIkFSQ0hTPSRhcmNo Iik7CiAgICAgfQpAQCAtNjM0LDcgKzYzNCw3IEBAIGZvciBteSAkdGVzdCAoQHRlc3RzKSB7CiAg ICAgICAgIGNsb3NlIEVYUEVDVEVEOwogICAgIH0KICAgICBteSAkZXhwZWN0ZWRNYWM7Ci0gICAg aWYgKCFpc09TWCgpICYmICRzdHJpY3RUZXN0aW5nICYmICEkaXNUZXh0KSB7CisgICAgaWYgKCFp c0FwcGxlTWFjV2ViS2l0KCkgJiYgJHN0cmljdFRlc3RpbmcgJiYgISRpc1RleHQpIHsKICAgICAg IGlmICghJHJlc2V0UmVzdWx0cyAmJiBvcGVuIEVYUEVDVEVELCAiPCIsICIkdGVzdERpcmVjdG9y eS9wbGF0Zm9ybS9tYWMvJGV4cGVjdGVkRmlsZU5hbWUiKSB7CiAgICAgICAgICRleHBlY3RlZE1h YyA9ICIiOwogICAgICAgICB3aGlsZSAoPEVYUEVDVEVEPikgewpAQCAtNzI2LDcgKzcyNiw3IEBA IGZvciBteSAkdGVzdCAoQHRlc3RzKSB7CiAgICAgICAgIH0KICAgICB9CiAKLSAgICBpZiAoIWlz T1NYKCkgJiYgJHN0cmljdFRlc3RpbmcgJiYgISRpc1RleHQpIHsKKyAgICBpZiAoIWlzQXBwbGVN YWNXZWJLaXQoKSAmJiAkc3RyaWN0VGVzdGluZyAmJiAhJGlzVGV4dCkgewogICAgICAgaWYgKGRl ZmluZWQgJGV4cGVjdGVkTWFjKSB7CiAgICAgICAgIG15ICRzaW1wbGlmaWVkX2FjdHVhbDsKICAg ICAgICAgJHNpbXBsaWZpZWRfYWN0dWFsID0gJGFjdHVhbDsKQEAgLTEyMzMsNyArMTIzMyw3IEBA IHN1YiBvcGVuRHVtcFRvb2woKQogCiAgICAgbXkgQGFyZ3MgPSBAdG9vbEFyZ3M7CiAgICAgdW5z aGlmdCBAYXJncywgJGR1bXBUb29sOwotICAgIGlmIChpc09TWCBhbmQgIWlzVGlnZXIoKSkgewor ICAgIGlmIChpc0FwcGxlTWFjV2ViS2l0IGFuZCAhaXNUaWdlcigpKSB7CiAgICAgICAgIHVuc2hp ZnQgQGFyZ3MsICJhcmNoIjsKICAgICB9CiAgICAgaWYgKCR1c2VWYWxncmluZCkgewpAQCAtMTI3 NCw3ICsxMjc0LDcgQEAgc3ViIGR1bXBUb29sRGlkQ3Jhc2goKQogICAgIHJldHVybiAxIGlmICgk cGlkID09ICRkdW1wVG9vbFBJRCk7CiAKICAgICAjIE9uIE1hYyBPUyBYLCBjcmFzaGluZyBtYXkg YmUgc2lnbmlmaWNhbnRseSBkZWxheWVkIGJ5IGNyYXNoIHJlcG9ydGVyLgotICAgIHJldHVybiAw IHVubGVzcyBpc09TWCgpOworICAgIHJldHVybiAwIHVubGVzcyBpc0FwcGxlTWFjV2ViS2l0KCk7 CiAKICAgICBteSAkdHJ5aW5nVG9FeGl0ID0gMDsKICAgICBvcGVuIFBTLCAicHMgLW8gc3RhdGUg LXAgJGR1bXBUb29sUElEIHwiOwpAQCAtMTg2Miw3ICsxODYyLDcgQEAgc3ViIHNldEZpbGVIYW5k bGVOb25CbG9ja2luZygqJCkKIAogc3ViIHNhbXBsZUR1bXBUb29sKCkKIHsKLSAgICByZXR1cm4g dW5sZXNzIGlzT1NYKCk7CisgICAgcmV0dXJuIHVubGVzcyBpc0FwcGxlTWFjV2ViS2l0KCk7CiAg ICAgcmV0dXJuIHVubGVzcyAkcnVuU2FtcGxlOwogCiAgICAgbXkgJG91dHB1dERpcmVjdG9yeSA9 ICIkRU5We0hPTUV9L0xpYnJhcnkvTG9ncy9EdW1wUmVuZGVyVHJlZSI7CmRpZmYgLS1naXQgYS9X ZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0gYi9XZWJLaXRUb29scy9TY3JpcHRzL3dl YmtpdGRpcnMucG0KaW5kZXggMTM0MGViMS4uYTBmMjI2ZCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9v bHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 ZGlycy5wbQpAQCAtNTYsNiArNTYsNyBAQCBteSAkb3NYVmVyc2lvbjsKIG15ICRpc1F0OwogbXkg JGlzR3RrOwogbXkgJGlzV3g7CitteSAkaXNDaHJvbWl1bTsKIG15ICRmb3JjZVJ1bjY0Qml0Owog CiAjIFZhcmlhYmxlcyBmb3IgV2luMzIgc3VwcG9ydApAQCAtOTAsNyArOTEsNyBAQCBzdWIgZGV0 ZXJtaW5lQmFzZVByb2R1Y3REaXIKIHsKICAgICByZXR1cm4gaWYgZGVmaW5lZCAkYmFzZVByb2R1 Y3REaXI7CiAgICAgZGV0ZXJtaW5lU291cmNlRGlyKCk7Ci0gICAgaWYgKGlzT1NYKCkpIHsKKyAg ICBpZiAoaXNBcHBsZU1hY1dlYktpdCgpKSB7CiAgICAgICAgIG9wZW4gUFJPRFVDVCwgImRlZmF1 bHRzIHJlYWQgY29tLmFwcGxlLlhjb2RlIFBCWEFwcGxpY2F0aW9ud2lkZUJ1aWxkU2V0dGluZ3Mg Mj4gL2Rldi9udWxsIHwiIG9yIGRpZTsKICAgICAgICAgJGJhc2VQcm9kdWN0RGlyID0gam9pbiAn JywgPFBST0RVQ1Q+OwogICAgICAgICBjbG9zZSBQUk9EVUNUOwpAQCAtMTE2LDcgKzExNyw3IEBA IHN1YiBkZXRlcm1pbmVCYXNlUHJvZHVjdERpcgogICAgICAgICB9CiAgICAgfQogCi0gICAgaWYg KCRiYXNlUHJvZHVjdERpciAmJiBpc09TWCgpKSB7CisgICAgaWYgKCRiYXNlUHJvZHVjdERpciAm JiBpc0FwcGxlTWFjV2ViS2l0KCkpIHsKICAgICAgICAgJGJhc2VQcm9kdWN0RGlyID1+IHN8XlxR JChTUkNST09UKS8uLlxFJHwkc291cmNlRGlyfDsKICAgICAgICAgJGJhc2VQcm9kdWN0RGlyID1+ IHN8XlxRJChTUkNST09UKS8uLi98JHNvdXJjZURpci98OwogICAgICAgICAkYmFzZVByb2R1Y3RE aXIgPX4gc3xefi98JEVOVntIT01FfS98OwpAQCAtMTMzLDcgKzEzNCw3IEBAIHN1YiBkZXRlcm1p bmVCYXNlUHJvZHVjdERpcgogICAgICAgICAgICAgJGJhc2VQcm9kdWN0RGlyID0gIiRiYXNlUHJv ZHVjdERpci8kYnJhbmNoIjsKICAgICAgICAgfQogCi0gICAgICAgIEBiYXNlUHJvZHVjdERpck9w dGlvbiA9ICgiU1lNUk9PVD0kYmFzZVByb2R1Y3REaXIiLCAiT0JKUk9PVD0kYmFzZVByb2R1Y3RE aXIiKSBpZiAoaXNPU1goKSk7CisgICAgICAgIEBiYXNlUHJvZHVjdERpck9wdGlvbiA9ICgiU1lN Uk9PVD0kYmFzZVByb2R1Y3REaXIiLCAiT0JKUk9PVD0kYmFzZVByb2R1Y3REaXIiKSBpZiAoaXNB cHBsZU1hY1dlYktpdCgpKTsKICAgICAgICAgaWYgKGlzQ3lnd2luKCkpIHsKICAgICAgICAgICAg IG15ICRkb3NCdWlsZFBhdGggPSBgY3lncGF0aCAtLXdpbmRvd3MgXCIkYmFzZVByb2R1Y3REaXJc ImA7CiAgICAgICAgICAgICBjaG9tcCAkZG9zQnVpbGRQYXRoOwpAQCAtMzE3LDcgKzMxOCw3IEBA IHN1YiBzYWZhcmlQYXRoRnJvbVNhZmFyaUJ1bmRsZQogewogICAgIG15ICgkc2FmYXJpQnVuZGxl KSA9IEBfOwogCi0gICAgcmV0dXJuICIkc2FmYXJpQnVuZGxlL0NvbnRlbnRzL01hY09TL1NhZmFy aSIgaWYgaXNPU1goKTsKKyAgICByZXR1cm4gIiRzYWZhcmlCdW5kbGUvQ29udGVudHMvTWFjT1Mv U2FmYXJpIiBpZiBpc0FwcGxlTWFjV2ViS2l0KCk7CiAgICAgcmV0dXJuICRzYWZhcmlCdW5kbGUg aWYgaXNDeWd3aW4oKTsKIH0KIApAQCAtMzI1LDcgKzMyNiw3IEBAIHN1YiBpbnN0YWxsZWRTYWZh cmlQYXRoCiB7CiAgICAgbXkgJHNhZmFyaUJ1bmRsZTsKIAotICAgIGlmIChpc09TWCgpKSB7Cisg ICAgaWYgKGlzQXBwbGVNYWNXZWJLaXQoKSkgewogICAgICAgICAkc2FmYXJpQnVuZGxlID0gIi9B cHBsaWNhdGlvbnMvU2FmYXJpLmFwcCI7CiAgICAgfSBlbHNpZiAoaXNDeWd3aW4oKSkgewogICAg ICAgICAkc2FmYXJpQnVuZGxlID0gYCIkY29uZmlndXJhdGlvblByb2R1Y3REaXIvRmluZFNhZmFy aS5leGUiYDsKQEAgLTM0Niw3ICszNDcsNyBAQCBzdWIgc2FmYXJpUGF0aAogICAgIGlmICghJHNh ZmFyaUJ1bmRsZSkgewogICAgICAgICBkZXRlcm1pbmVDb25maWd1cmF0aW9uUHJvZHVjdERpcigp OwogICAgICAgICAjIFVzZSBTYWZhcmkuYXBwIGluIHByb2R1Y3QgZGlyZWN0b3J5IGlmIHByZXNl bnQgKGdvb2QgZm9yIFNhZmFyaSBkZXZlbG9wbWVudCB0ZWFtKS4KLSAgICAgICAgaWYgKGlzT1NY KCkgJiYgLWQgIiRjb25maWd1cmF0aW9uUHJvZHVjdERpci9TYWZhcmkuYXBwIikgeworICAgICAg ICBpZiAoaXNBcHBsZU1hY1dlYktpdCgpICYmIC1kICIkY29uZmlndXJhdGlvblByb2R1Y3REaXIv U2FmYXJpLmFwcCIpIHsKICAgICAgICAgICAgICRzYWZhcmlCdW5kbGUgPSAiJGNvbmZpZ3VyYXRp b25Qcm9kdWN0RGlyL1NhZmFyaS5hcHAiOwogICAgICAgICB9IGVsc2lmIChpc0N5Z3dpbigpICYm IC14ICIkY29uZmlndXJhdGlvblByb2R1Y3REaXIvYmluL1NhZmFyaS5leGUiKSB7CiAgICAgICAg ICAgICAkc2FmYXJpQnVuZGxlID0gIiRjb25maWd1cmF0aW9uUHJvZHVjdERpci9iaW4vU2FmYXJp LmV4ZSI7CkBAIC0zNTUsNyArMzU2LDcgQEAgc3ViIHNhZmFyaVBhdGgKICAgICAgICAgfQogICAg IH0KICAgICBteSAkc2FmYXJpUGF0aCA9IHNhZmFyaVBhdGhGcm9tU2FmYXJpQnVuZGxlKCRzYWZh cmlCdW5kbGUpOwotICAgIGRpZSAiQ2FuJ3QgZmluZCBleGVjdXRhYmxlIGF0ICRzYWZhcmlQYXRo LlxuIiBpZiBpc09TWCgpICYmICEteCAkc2FmYXJpUGF0aDsKKyAgICBkaWUgIkNhbid0IGZpbmQg ZXhlY3V0YWJsZSBhdCAkc2FmYXJpUGF0aC5cbiIgaWYgaXNBcHBsZU1hY1dlYktpdCgpICYmICEt eCAkc2FmYXJpUGF0aDsKICAgICByZXR1cm4gJHNhZmFyaVBhdGg7CiB9CiAKQEAgLTM2Niw3ICsz NjcsNyBAQCBzdWIgYnVpbHREeWxpYlBhdGhGb3JOYW1lCiAgICAgaWYgKGlzUXQoKSBvciBpc0d0 aygpKSB7CiAgICAgICAgIHJldHVybiAiJGNvbmZpZ3VyYXRpb25Qcm9kdWN0RGlyLyRmcmFtZXdv cmsiOwogICAgIH0KLSAgICBpZiAoaXNPU1goKSkgeworICAgIGlmIChpc0FwcGxlTWFjV2ViS2l0 KCkpIHsKICAgICAgICAgcmV0dXJuICIkY29uZmlndXJhdGlvblByb2R1Y3REaXIvJGZyYW1ld29y ay5mcmFtZXdvcmsvVmVyc2lvbnMvQS8kZnJhbWV3b3JrIjsKICAgICB9CiAgICAgaWYgKGlzQ3ln d2luKCkpIHsKQEAgLTM4NSw3ICszODYsNyBAQCBzdWIgY2hlY2tGcmFtZXdvcmtzCiB7CiAgICAg cmV0dXJuIGlmIGlzQ3lnd2luKCk7CiAgICAgbXkgQGZyYW1ld29ya3MgPSAoIkphdmFTY3JpcHRD b3JlIiwgIldlYkNvcmUiKTsKLSAgICBwdXNoKEBmcmFtZXdvcmtzLCAiV2ViS2l0IikgaWYgaXNP U1goKTsKKyAgICBwdXNoKEBmcmFtZXdvcmtzLCAiV2ViS2l0IikgaWYgaXNBcHBsZU1hY1dlYktp dCgpOwogICAgIGZvciBteSAkZnJhbWV3b3JrIChAZnJhbWV3b3JrcykgewogICAgICAgICBteSAk cGF0aCA9IGJ1aWx0RHlsaWJQYXRoRm9yTmFtZSgkZnJhbWV3b3JrKTsKICAgICAgICAgZGllICJD YW4ndCBmaW5kIGJ1aWx0IGZyYW1ld29yayBhdCBcIiRwYXRoXCIuXG4iIHVubGVzcyAteCAkcGF0 aDsKQEAgLTU2OCw2ICs1NjksMjMgQEAgc3ViIGlzRGViaWFuQmFzZWQoKQogICAgIHJldHVybiAt ZSAiL2V0Yy9kZWJpYW5fdmVyc2lvbiI7CiB9CiAKK3N1YiBpc0Nocm9taXVtKCkKK3sKKyAgICBk ZXRlcm1pbmVJc0Nocm9taXVtKCk7CisgICAgcmV0dXJuICRpc0Nocm9taXVtOworfQorCitzdWIg ZGV0ZXJtaW5lSXNDaHJvbWl1bSgpCit7CisgICAgcmV0dXJuIGlmIGRlZmluZWQoJGlzQ2hyb21p dW0pOworCisgICAgaWYgKGNoZWNrQXJndigiLS1jaHJvbWl1bSIpKSB7CisgICAgICAgICRpc0No cm9taXVtID0gMTsKKyAgICB9IGVsc2UgeworICAgICAgICAkaXNDaHJvbWl1bSA9IDA7CisgICAg fQorfQorCiBzdWIgaXNDeWd3aW4oKQogewogICAgIHJldHVybiAoJF5PIGVxICJjeWd3aW4iKSB8 fCAwOwpAQCAtNTc4LDE5ICs1OTYsMjUgQEAgc3ViIGlzRGFyd2luKCkKICAgICByZXR1cm4gKCRe TyBlcSAiZGFyd2luIikgfHwgMDsKIH0KIAotIyBpc09TWCgpIG9ubHkgcmV0dXJucyB0cnVlIGZv ciBBcHBsZSdzIHBvcnQsIG5vdCBmb3Igb3RoZXIgcG9ydHMgdGhhdCBjYW4gYmUKLSMgYnVpbHQv cnVuIG9uIE9TIFguCi1zdWIgaXNPU1goKQorIyBpc0FwcGxlTWFjV2ViS2l0KCkgb25seSByZXR1 cm5zIHRydWUgZm9yIEFwcGxlJ3MgcG9ydCwKKyMgbm90IGZvciBvdGhlciBwb3J0cyB0aGF0IGNh biBiZSBidWlsdC9ydW4gb24gT1MgWC4KK3N1YiBpc0FwcGxlTWFjV2ViS2l0KCkKIHsKLSAgICBy ZXR1cm4gaXNEYXJ3aW4oKSB1bmxlc3MgKGlzUXQoKSBvciBpc0d0aygpIG9yIGlzV3goKSk7Ci0g ICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIGlzRGFyd2luKCkgYW5kICEoaXNRdCgpIG9yIGlzR3Rr KCkgb3IgaXNXeCgpIG9yIGlzQ2hyb21pdW0oKSk7Cit9CisKKyMgaXNBcHBsZVdpbldlYktpdCgp IG9ubHkgcmV0dXJucyB0cnVlIGZvciBBcHBsZSdzIHBvcnQsCisjIG5vdCBmb3Igb3RoZXIgcG9y dHMgdGhhdCBjYW4gYmUgYnVpbHQvcnVuIG9uIFdpbmRvd3MKK3N1YiBpc0FwcGxlV2luV2ViS2l0 KCkKK3sKKyAgICByZXR1cm4gaXNDeWd3aW4oKSBhbmQgIShpc1F0KCkgb3IgaXNHdGsoKSBvciBp c1d4KCkgb3IgaXNDaHJvbWl1bSgpKTsKIH0KIAogc3ViIGRldGVybWluZU9TWFZlcnNpb24oKQog ewogICAgIHJldHVybiBpZiAkb3NYVmVyc2lvbjsKIAotICAgIGlmICghaXNPU1goKSkgeworICAg IGlmICghaXNBcHBsZU1hY1dlYktpdCgpKSB7CiAgICAgICAgICRvc1hWZXJzaW9uID0gLTE7CiAg ICAgICAgIHJldHVybjsKICAgICB9CkBAIC02MTMsMTcgKzYzNywxNyBAQCBzdWIgb3NYVmVyc2lv bigpCiAKIHN1YiBpc1RpZ2VyKCkKIHsKLSAgICByZXR1cm4gaXNPU1goKSAmJiBvc1hWZXJzaW9u KCktPnsibWlub3IifSA9PSA0OworICAgIHJldHVybiBpc0FwcGxlTWFjV2ViS2l0KCkgJiYgb3NY VmVyc2lvbigpLT57Im1pbm9yIn0gPT0gNDsKIH0KIAogc3ViIGlzTGVvcGFyZCgpCiB7Ci0gICAg cmV0dXJuIGlzT1NYKCkgJiYgb3NYVmVyc2lvbigpLT57Im1pbm9yIn0gPT0gNTsKKyAgICByZXR1 cm4gaXNBcHBsZU1hY1dlYktpdCgpICYmIG9zWFZlcnNpb24oKS0+eyJtaW5vciJ9ID09IDU7CiB9 CiAKIHN1YiBpc1Nub3dMZW9wYXJkKCkKIHsKLSAgICByZXR1cm4gaXNPU1goKSAmJiBvc1hWZXJz aW9uKCktPnsibWlub3IifSA9PSA2OworICAgIHJldHVybiBpc0FwcGxlTWFjV2ViS2l0KCkgJiYg b3NYVmVyc2lvbigpLT57Im1pbm9yIn0gPT0gNjsKIH0KIAogc3ViIHJlbGF0aXZlU2NyaXB0c0Rp cigpCkBAIC02NDAsNyArNjY0LDcgQEAgc3ViIGxhdW5jaGVyUGF0aCgpCiAgICAgbXkgJHJlbGF0 aXZlU2NyaXB0c1BhdGggPSByZWxhdGl2ZVNjcmlwdHNEaXIoKTsKICAgICBpZiAoaXNHdGsoKSB8 fCBpc1F0KCkpIHsKICAgICAgICAgcmV0dXJuICIkcmVsYXRpdmVTY3JpcHRzUGF0aC9ydW4tbGF1 bmNoZXIiOwotICAgIH0gZWxzaWYgKGlzT1NYKCkgfHwgaXNDeWd3aW4oKSkgeworICAgIH0gZWxz aWYgKGlzQXBwbGVNYWNXZWJLaXQoKSB8fCBpc0N5Z3dpbigpKSB7CiAgICAgICAgIHJldHVybiAi JHJlbGF0aXZlU2NyaXB0c1BhdGgvcnVuLXNhZmFyaSI7CiAgICAgfQogfQpAQCAtNjUxLDE0ICs2 NzUsMTQgQEAgc3ViIGxhdW5jaGVyTmFtZSgpCiAgICAgICAgIHJldHVybiAiR3RrTGF1bmNoZXIi OwogICAgIH0gZWxzaWYgKGlzUXQoKSkgewogICAgICAgICByZXR1cm4gIlF0TGF1bmNoZXIiOwot ICAgIH0gZWxzaWYgKGlzT1NYKCkgfHwgaXNDeWd3aW4oKSkgeworICAgIH0gZWxzaWYgKGlzQXBw bGVNYWNXZWJLaXQoKSB8fCBpc0N5Z3dpbigpKSB7CiAgICAgICAgIHJldHVybiAiU2FmYXJpIjsK ICAgICB9CiB9CiAKIHN1YiBjaGVja1JlcXVpcmVkU3lzdGVtQ29uZmlnCiB7Ci0gICAgaWYgKGlz T1NYKCkpIHsKKyAgICBpZiAoaXNBcHBsZU1hY1dlYktpdCgpKSB7CiAgICAgICAgIGNob21wKG15 ICRwcm9kdWN0VmVyc2lvbiA9IGBzd192ZXJzIC1wcm9kdWN0VmVyc2lvbmApOwogICAgICAgICBp ZiAoJHByb2R1Y3RWZXJzaW9uIGx0ICIxMC40IikgewogICAgICAgICAgICAgcHJpbnQgIioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKipc biI7CkBAIC05NzYsNyArMTAwMCw3IEBAIHN1YiBydW5TYWZhcmkKIHsKICAgICBteSAoJGRlYnVn Z2VyKSA9IEBfOwogCi0gICAgaWYgKGlzT1NYKCkpIHsKKyAgICBpZiAoaXNBcHBsZU1hY1dlYktp dCgpKSB7CiAgICAgICAgIHJldHVybiBzeXN0ZW0gIiRGaW5kQmluOjpCaW4vZ2RiLXNhZmFyaSIs IEBBUkdWIGlmICRkZWJ1Z2dlcjsKIAogICAgICAgICBteSAkcHJvZHVjdERpciA9IHByb2R1Y3RE aXIoKTsKQEAgLTEwMTUsNyArMTAzOSw3IEBAIHN1YiBzZXRSdW42NEJpdCgkKQogCiBzdWIgcHJl ZmVycmVkQXJjaGl0ZWN0dXJlCiB7Ci0gICAgcmV0dXJuIHVubGVzcyBpc09TWCgpOworICAgIHJl dHVybiB1bmxlc3MgaXNBcHBsZU1hY1dlYktpdCgpOwogICAgIAogICAgIG15ICRmcmFtZXdvcmsg PSBzaGlmdDsKICAgICAkZnJhbWV3b3JrID0gIldlYktpdCIgaWYgIWRlZmluZWQoJGZyYW1ld29y ayk7CkBAIC0xMDM5LDcgKzEwNjMsNyBAQCBzdWIgcHJlZmVycmVkQXJjaGl0ZWN0dXJlCiAKIHN1 YiBleHBvcnRBcmNoUHJlZmVyZW5jZQogewotICAgICRFTlZ7QVJDSFBSRUZFUkVOQ0V9ID0gcHJl ZmVycmVkQXJjaGl0ZWN0dXJlKCkgaWYgaXNPU1goKTsKKyAgICAkRU5We0FSQ0hQUkVGRVJFTkNF fSA9IHByZWZlcnJlZEFyY2hpdGVjdHVyZSgpIGlmIGlzQXBwbGVNYWNXZWJLaXQoKTsKIH0KIAog MTsK 25532 2008-11-26 13:45:04 -0800 2008-11-26 15:47:38 -0800 Change a few calls to isCygwin to isAppleWinWebKit and isAppleMacWebKit to isDarwin in preperation for a --chromium build ygwin-to-isAppleWinWebKit-and-isAppleMacWebKit-to-isDarwin-in-preperation-for-a-chromium-build.patch text/plain 9637 eric OGEwNjI0ZDFlOGNiOGQyMDY4NjM0MWUwNzYxNDY0M2ZlNzE0ZDVkNgpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9XZWJDb3JlL1dlYkNvcmUu eGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRleCBmZmU5ZjI0Li5jMGIzZDZkIDEwMDY0NAot LS0gYS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9XZWJD b3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtNjcxOCw3ICs2NzE4LDcg QEAKIAkJOTNFRUMxRjcwOUMyODc3NzAwQzUxNUQxIC8qIFdoZWVsRXZlbnQuaWRsICovID0ge2lz YSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBl ID0gdGV4dDsgcGF0aCA9IFdoZWVsRXZlbnQuaWRsOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9 OwogCQk5M0VFQzI2RTA5QzMyMTgwMDBDNTE1RDEgLyogQ2FudmFzUGF0dGVybi5jcHAgKi8gPSB7 aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5 cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBDYW52YXNQYXR0ZXJuLmNwcDsgc291cmNl VHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJOTNFRUMyNzAwOUMzMjE4ODAwQzUxNUQxIC8qIENhbnZh c1N0eWxlLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0 OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IENhbnZhc1N0 eWxlLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKLQkJOTNGMTlCMTkwODI0NUU1OTAw MUU5QUJDIC8qIEluZm8ucGxpc3QgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgaW5kZW50 V2lkdGggPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQueG1sOyBwYXRoID0gSW5mby5wbGlz dDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgdGFiV2lkdGggPSA4OyB1c2VzVGFicyA9IDA7IH07 CisJCTkzRjE5QjE5MDgyNDVFNTkwMDFFOUFCQyAvKiBJbmZvLnBsaXN0ICovID0ge2lzYSA9IFBC WEZpbGVSZWZlcmVuY2U7IGluZGVudFdpZHRoID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSB0ZXh0 LnBsaXN0LnhtbDsgcGF0aCA9IEluZm8ucGxpc3Q7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IHRh YldpZHRoID0gODsgdXNlc1RhYnMgPSAwOyB9OwogCQk5M0YxOUIxQTA4MjQ1RTVBMDAxRTlBQkMg LyogV2ViQ29yZS5mcmFtZXdvcmsgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZXhwbGlj aXRGaWxlVHlwZSA9IHdyYXBwZXIuZnJhbWV3b3JrOyBpbmNsdWRlSW5JbmRleCA9IDA7IHBhdGgg PSBXZWJDb3JlLmZyYW1ld29yazsgc291cmNlVHJlZSA9IEJVSUxUX1BST0RVQ1RTX0RJUjsgfTsK IAkJOTNGMUQzMUEwNTU4Q0M1QzAwODIxQkMwIC8qIGxpYmljdWNvcmUuZHlsaWIgKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSAiY29tcGlsZWQubWFjaC1v LmR5bGliIjsgbmFtZSA9IGxpYmljdWNvcmUuZHlsaWI7IHBhdGggPSAvdXNyL2xpYi9saWJpY3Vj b3JlLmR5bGliOyBzb3VyY2VUcmVlID0gIjxhYnNvbHV0ZT4iOyB9OwogCQk5M0Y4QjMwNTBBMzAw RkUxMDBGNjFBQjggLyogQ29kZUdlbmVyYXRvci5wbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQuc2NyaXB0LnBl cmw7IG5hbWUgPSBDb2RlR2VuZXJhdG9yLnBtOyBwYXRoID0gc2NyaXB0cy9Db2RlR2VuZXJhdG9y LnBtOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAtMTY0NzIsNiArMTY0NzIsNyBAQAog CQkwODY3RDY5MEZFODQwMjhGQzAyQUFDMDcgLyogUHJvamVjdCBvYmplY3QgKi8gPSB7CiAJCQlp c2EgPSBQQlhQcm9qZWN0OwogCQkJYnVpbGRDb25maWd1cmF0aW9uTGlzdCA9IDE0OUMyODQzMDg5 MDJCMTEwMDhBOUVGQyAvKiBCdWlsZCBjb25maWd1cmF0aW9uIGxpc3QgZm9yIFBCWFByb2plY3Qg IldlYkNvcmUiICovOworCQkJY29tcGF0aWJpbGl0eVZlcnNpb24gPSAiWGNvZGUgMi40IjsKIAkJ CWhhc1NjYW5uZWRGb3JFbmNvZGluZ3MgPSAxOwogCQkJa25vd25SZWdpb25zID0gKAogCQkJCUVu Z2xpc2gsCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9DaGFuZ2VMb2cgYi9XZWJLaXRUb29scy9D aGFuZ2VMb2cKaW5kZXggYmRmMTNjNS4uMmZjMzUxZSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMv Q2hhbmdlTG9nCisrKyBiL1dlYktpdFRvb2xzL0NoYW5nZUxvZwpAQCAtMiw2ICsyLDE4IEBACiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCiAKKyAgICAgICAgTW9yZSBwcmUt d29yayBmb3IgYWRkaW5nIGEgYnVpbGQtd2Via2l0IC0tY2hyb21pdW0gd2hpY2ggd29ya3Mgb24g TWFjIGFuZCBXaW5kb3dzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMjUxNQorICAgICAgICBDaGFuZ2UgYSBmZXcgY2FsbHMgdG8gaXNDeWd3aW4gdG8g aXNBcHBsZVdpbldlYktpdCBhbmQgYSBmZXcgY2FsbHMgdG8gaXNBcHBsZU1hY1dlYktpdCB0byBp c0RhcndpbgorICAgICAgICBpbiBwcmVwYXJhdGlvbiBmb3IgaGF2aW5nIGEgY2hyb21pdW0gY3ln d2luIGFuZCBjaHJvbWl1bSBtYWMgYnVpbGQKKworICAgICAgICAqIFNjcmlwdHMvYnVpbGQtd2Vi a2l0OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbToKKworMjAwOC0xMS0yNiAgRXJp YyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKICAgICAgICAgUHJlLXdvcmsgZm9yIGdldHRpbmcgYnVpbGQtd2Via2l0IC0t Y2hyb21pdW0gdG8gd29yawogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjI1MTUKICAgICAgICAgUmVuYW1lIGlzT1NYIHRvIGlzQXBwbGVNYWNXZWJLaXQg dG8gbWF0Y2ggd2hhdCB0aGUgY29kZSBkb2VzLCBhbmQgYWRkIGlzQ2hyb21pdW0oKQpkaWZmIC0t Z2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQgYi9XZWJLaXRUb29scy9TY3Jp cHRzL2J1aWxkLXdlYmtpdAppbmRleCBjMTU0MmRiLi5kNmYyZTBhIDEwMDc1NQotLS0gYS9XZWJL aXRUb29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL2J1 aWxkLXdlYmtpdApAQCAtNTYsOCArNTYsOCBAQCBteSAkeHBhdGhTdXBwb3J0ID0gMTsKIG15ICR4 c2x0U3VwcG9ydCA9IDE7CiBteSAkd21sU3VwcG9ydCA9IDA7CiBteSAkY292ZXJhZ2VTdXBwb3J0 ID0gMDsKLW15ICR2aWRlb1N1cHBvcnQgPSAoaXNBcHBsZU1hY1dlYktpdCgpIHx8IGlzQ3lnd2lu KCkpOyAjIEVuYWJsZSBieSBkZWZhdWx0IG9uIE9TWCBhbmQgV2luZG93cwotbXkgJHdvcmtlcnNT dXBwb3J0ID0gKGlzQXBwbGVNYWNXZWJLaXQoKSB8fCBpc0N5Z3dpbigpIHx8IGlzR3RrKCkpOyAj IEVuYWJsZSBieSBkZWZhdWx0IG9uIE9TWCwgV2luZG93cyBhbmQgR3RrKworbXkgJHZpZGVvU3Vw cG9ydCA9IChpc0FwcGxlTWFjV2ViS2l0KCkgfHwgaXNBcHBsZVdpbldlYktpdCgpKTsgIyBFbmFi bGUgYnkgZGVmYXVsdCBvbiBPU1ggYW5kIFdpbmRvd3MKK215ICR3b3JrZXJzU3VwcG9ydCA9IChp c0FwcGxlTWFjV2ViS2l0KCkgfHwgaXNBcHBsZVdpbldlYktpdCgpIHx8IGlzR3RrKCkpOyAjIEVu YWJsZSBieSBkZWZhdWx0IG9uIE9TWCwgV2luZG93cyBhbmQgR3RrKwogbXkgJHNob3dIZWxwID0g MDsKIG15ICRjbGVhbiA9IDA7CiBteSAkYnVpbGRVbml2ZXJzYWwgPSAwOwpAQCAtMjg4LDcgKzI4 OCw3IEBAIGlmIChpc0FwcGxlTWFjV2ViS2l0KCkpIHsKICAgICB9CiB9CiAKLWlmIChpc0N5Z3dp bigpKSB7CitpZiAoaXNBcHBsZVdpbldlYktpdCgpKSB7CiAgICAgIyBDb3B5IFdlYktpdFN1cHBv cnRMaWJyYXJ5IHRvIHRoZSBjb3JyZWN0IGxvY2F0aW9uIGluIFdlYktpdExpYnJhcmllcyBzbyBp dCBjYW4gYmUgZm91bmQuCiAgICAgIyBXaWxsIGZhaWwgaWYgV2ViS2l0U3VwcG9ydExpYnJhcnku emlwIGlzIG5vdCBpbiBzb3VyY2Ugcm9vdC4KICAgICAoc3lzdGVtKCJwZXJsIFdlYktpdFRvb2xz L1NjcmlwdHMvdXBkYXRlLXdlYmtpdC1zdXBwb3J0LWxpYnMiKSA9PSAwKSBvciBkaWU7CkBAIC0z MTQsMTQgKzMxNCwxNCBAQCBmb3IgbXkgJGRpciAoQHByb2plY3RzKSB7CiAgICAgICAgICRyZXN1 bHQgPSBidWlsZFFNYWtlUXRQcm9qZWN0KCRkaXIsICRjbGVhbiwgQEFSR1YpOwogICAgIH0gZWxz aWYgKGlzQXBwbGVNYWNXZWJLaXQoKSkgewogICAgICAgICAkcmVzdWx0ID0gc3lzdGVtICJ4Y29k ZWJ1aWxkIiwgIi1wcm9qZWN0IiwgIiRkaXIueGNvZGVwcm9qIiwgQG9wdGlvbnMsICRvdmVycmlk ZUZlYXR1cmVEZWZpbmVzU3RyaW5nLCBAY292ZXJhZ2VTdXBwb3J0T3B0aW9uLCBAQVJHVjsKLSAg ICB9IGVsc2lmIChpc0N5Z3dpbigpKSB7CisgICAgfSBlbHNpZiAoaXNBcHBsZVdpbldlYktpdCgp KSB7CiAgICAgICAgIGlmICgkZGlyIGVxICJXZWJLaXQiKSB7CiAgICAgICAgICAgICAkcmVzdWx0 ID0gYnVpbGRWaXN1YWxTdHVkaW9Qcm9qZWN0KCJ3aW4vV2ViS2l0LnZjcHJvai9XZWJLaXQuc2xu IiwgJGNsZWFuKTsKICAgICAgICAgfQogICAgIH0KIAogICAgIGlmIChleGl0U3RhdHVzKCRyZXN1 bHQpKSB7Ci0gICAgICAgIGlmIChpc0N5Z3dpbigpKSB7CisgICAgICAgIGlmIChpc0FwcGxlV2lu V2ViS2l0KCkpIHsKICAgICAgICAgICAgIHByaW50ICJcblxuPT09PT0gQlVJTEQgRkFJTEVEID09 PT09PVxuXG4iOwogICAgICAgICAgICAgbXkgJHNjcmlwdERpciA9IHJlbGF0aXZlU2NyaXB0c0Rp cigpOwogICAgICAgICAgICAgcHJpbnQgIlBsZWFzZSBlbnN1cmUgeW91IGhhdmUgcnVuICRzY3Jp cHREaXIvdXBkYXRlLXdlYmtpdCB0byBpbnN0YWxsIGRlcGVuZWRlbmNpZXMuXG5cbiI7CmRpZmYg LS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0gYi9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdGRpcnMucG0KaW5kZXggYTBmMjI2ZC4uYjM1ZTgzMCAxMDA2NDQKLS0tIGEv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCisrKyBiL1dlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0ZGlycy5wbQpAQCAtMTEwLDcgKzExMCw3IEBAIHN1YiBkZXRlcm1pbmVCYXNlUHJv ZHVjdERpcgogICAgICAgICB9CiAgICAgfSBlbHNlIHsKICAgICAgICAgJGJhc2VQcm9kdWN0RGly ID0gJEVOVnsiV0VCS0lUT1VUUFVURElSIn07Ci0gICAgICAgIGlmIChpc0N5Z3dpbigpICYmICRi YXNlUHJvZHVjdERpcikgeworICAgICAgICBpZiAoaXNBcHBsZVdpbldlYktpdCgpICYmICRiYXNl UHJvZHVjdERpcikgewogICAgICAgICAgICAgbXkgJHVuaXhCdWlsZFBhdGggPSBgY3lncGF0aCAt LXVuaXggXCIkYmFzZVByb2R1Y3REaXJcImA7CiAgICAgICAgICAgICBjaG9tcCAkdW5peEJ1aWxk UGF0aDsKICAgICAgICAgICAgICRiYXNlUHJvZHVjdERpciA9ICR1bml4QnVpbGRQYXRoOwpAQCAt MTgyLDcgKzE4Miw3IEBAIHN1YiBkZXRlcm1pbmVDb25maWd1cmF0aW9uUHJvZHVjdERpcgogICAg IHJldHVybiBpZiBkZWZpbmVkICRjb25maWd1cmF0aW9uUHJvZHVjdERpcjsKICAgICBkZXRlcm1p bmVCYXNlUHJvZHVjdERpcigpOwogICAgIGRldGVybWluZUNvbmZpZ3VyYXRpb24oKTsKLSAgICBp ZiAoaXNDeWd3aW4oKSAmJiAhaXNXeCgpKSB7CisgICAgaWYgKGlzQXBwbGVXaW5XZWJLaXQoKSAm JiAhaXNXeCgpKSB7CiAgICAgICAgICRjb25maWd1cmF0aW9uUHJvZHVjdERpciA9ICIkYmFzZVBy b2R1Y3REaXIvYmluIjsKICAgICB9IGVsc2UgewogICAgICAgICAkY29uZmlndXJhdGlvblByb2R1 Y3REaXIgPSAiJGJhc2VQcm9kdWN0RGlyLyRjb25maWd1cmF0aW9uIjsKQEAgLTMxOSw3ICszMTks NyBAQCBzdWIgc2FmYXJpUGF0aEZyb21TYWZhcmlCdW5kbGUKICAgICBteSAoJHNhZmFyaUJ1bmRs ZSkgPSBAXzsKIAogICAgIHJldHVybiAiJHNhZmFyaUJ1bmRsZS9Db250ZW50cy9NYWNPUy9TYWZh cmkiIGlmIGlzQXBwbGVNYWNXZWJLaXQoKTsKLSAgICByZXR1cm4gJHNhZmFyaUJ1bmRsZSBpZiBp c0N5Z3dpbigpOworICAgIHJldHVybiAkc2FmYXJpQnVuZGxlIGlmIGlzQXBwbGVXaW5XZWJLaXQo KTsKIH0KIAogc3ViIGluc3RhbGxlZFNhZmFyaVBhdGgKQEAgLTMyOCw3ICszMjgsNyBAQCBzdWIg aW5zdGFsbGVkU2FmYXJpUGF0aAogCiAgICAgaWYgKGlzQXBwbGVNYWNXZWJLaXQoKSkgewogICAg ICAgICAkc2FmYXJpQnVuZGxlID0gIi9BcHBsaWNhdGlvbnMvU2FmYXJpLmFwcCI7Ci0gICAgfSBl bHNpZiAoaXNDeWd3aW4oKSkgeworICAgIH0gZWxzaWYgKGlzQXBwbGVXaW5XZWJLaXQoKSkgewog ICAgICAgICAkc2FmYXJpQnVuZGxlID0gYCIkY29uZmlndXJhdGlvblByb2R1Y3REaXIvRmluZFNh ZmFyaS5leGUiYDsKICAgICAgICAgJHNhZmFyaUJ1bmRsZSA9fiBzL1tcclxuXSskLy87CiAgICAg ICAgICRzYWZhcmlCdW5kbGUgPSBgY3lncGF0aCAtdSAnJHNhZmFyaUJ1bmRsZSdgOwpAQCAtMzQ5 LDcgKzM0OSw3IEBAIHN1YiBzYWZhcmlQYXRoCiAgICAgICAgICMgVXNlIFNhZmFyaS5hcHAgaW4g cHJvZHVjdCBkaXJlY3RvcnkgaWYgcHJlc2VudCAoZ29vZCBmb3IgU2FmYXJpIGRldmVsb3BtZW50 IHRlYW0pLgogICAgICAgICBpZiAoaXNBcHBsZU1hY1dlYktpdCgpICYmIC1kICIkY29uZmlndXJh dGlvblByb2R1Y3REaXIvU2FmYXJpLmFwcCIpIHsKICAgICAgICAgICAgICRzYWZhcmlCdW5kbGUg PSAiJGNvbmZpZ3VyYXRpb25Qcm9kdWN0RGlyL1NhZmFyaS5hcHAiOwotICAgICAgICB9IGVsc2lm IChpc0N5Z3dpbigpICYmIC14ICIkY29uZmlndXJhdGlvblByb2R1Y3REaXIvYmluL1NhZmFyaS5l eGUiKSB7CisgICAgICAgIH0gZWxzaWYgKGlzQXBwbGVXaW5XZWJLaXQoKSAmJiAteCAiJGNvbmZp Z3VyYXRpb25Qcm9kdWN0RGlyL2Jpbi9TYWZhcmkuZXhlIikgewogICAgICAgICAgICAgJHNhZmFy aUJ1bmRsZSA9ICIkY29uZmlndXJhdGlvblByb2R1Y3REaXIvYmluL1NhZmFyaS5leGUiOwogICAg ICAgICB9IGVsc2UgewogICAgICAgICAgICAgcmV0dXJuIGluc3RhbGxlZFNhZmFyaVBhdGgoKTsK QEAgLTM3MCw3ICszNzAsNyBAQCBzdWIgYnVpbHREeWxpYlBhdGhGb3JOYW1lCiAgICAgaWYgKGlz QXBwbGVNYWNXZWJLaXQoKSkgewogICAgICAgICByZXR1cm4gIiRjb25maWd1cmF0aW9uUHJvZHVj dERpci8kZnJhbWV3b3JrLmZyYW1ld29yay9WZXJzaW9ucy9BLyRmcmFtZXdvcmsiOwogICAgIH0K LSAgICBpZiAoaXNDeWd3aW4oKSkgeworICAgIGlmIChpc0FwcGxlV2luV2ViS2l0KCkpIHsKICAg ICAgICAgaWYgKCRmcmFtZXdvcmsgZXEgIkphdmFTY3JpcHRDb3JlIikgewogICAgICAgICAgICAg ICAgIHJldHVybiAiJGJhc2VQcm9kdWN0RGlyL2xpYi8kZnJhbWV3b3JrLmxpYiI7CiAgICAgICAg IH0gZWxzZSB7CkBAIC02MTQsNyArNjE0LDcgQEAgc3ViIGRldGVybWluZU9TWFZlcnNpb24oKQog ewogICAgIHJldHVybiBpZiAkb3NYVmVyc2lvbjsKIAotICAgIGlmICghaXNBcHBsZU1hY1dlYktp dCgpKSB7CisgICAgaWYgKCFpc0RhcndpbigpKSB7CiAgICAgICAgICRvc1hWZXJzaW9uID0gLTE7 CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC02MzcsMTcgKzYzNywxNyBAQCBzdWIgb3NYVmVy c2lvbigpCiAKIHN1YiBpc1RpZ2VyKCkKIHsKLSAgICByZXR1cm4gaXNBcHBsZU1hY1dlYktpdCgp ICYmIG9zWFZlcnNpb24oKS0+eyJtaW5vciJ9ID09IDQ7CisgICAgcmV0dXJuIGlzRGFyd2luKCkg JiYgb3NYVmVyc2lvbigpLT57Im1pbm9yIn0gPT0gNDsKIH0KIAogc3ViIGlzTGVvcGFyZCgpCiB7 Ci0gICAgcmV0dXJuIGlzQXBwbGVNYWNXZWJLaXQoKSAmJiBvc1hWZXJzaW9uKCktPnsibWlub3Ii fSA9PSA1OworICAgIHJldHVybiBpc0RhcndpbigpICYmIG9zWFZlcnNpb24oKS0+eyJtaW5vciJ9 ID09IDU7CiB9CiAKIHN1YiBpc1Nub3dMZW9wYXJkKCkKIHsKLSAgICByZXR1cm4gaXNBcHBsZU1h Y1dlYktpdCgpICYmIG9zWFZlcnNpb24oKS0+eyJtaW5vciJ9ID09IDY7CisgICAgcmV0dXJuIGlz RGFyd2luKCkgJiYgb3NYVmVyc2lvbigpLT57Im1pbm9yIn0gPT0gNjsKIH0KIAogc3ViIHJlbGF0 aXZlU2NyaXB0c0RpcigpCkBAIC02NjQsNyArNjY0LDcgQEAgc3ViIGxhdW5jaGVyUGF0aCgpCiAg ICAgbXkgJHJlbGF0aXZlU2NyaXB0c1BhdGggPSByZWxhdGl2ZVNjcmlwdHNEaXIoKTsKICAgICBp ZiAoaXNHdGsoKSB8fCBpc1F0KCkpIHsKICAgICAgICAgcmV0dXJuICIkcmVsYXRpdmVTY3JpcHRz UGF0aC9ydW4tbGF1bmNoZXIiOwotICAgIH0gZWxzaWYgKGlzQXBwbGVNYWNXZWJLaXQoKSB8fCBp c0N5Z3dpbigpKSB7CisgICAgfSBlbHNpZiAoaXNBcHBsZU1hY1dlYktpdCgpIHx8IGlzQXBwbGVX aW5XZWJLaXQoKSkgewogICAgICAgICByZXR1cm4gIiRyZWxhdGl2ZVNjcmlwdHNQYXRoL3J1bi1z YWZhcmkiOwogICAgIH0KIH0KQEAgLTY3NSwxNCArNjc1LDE0IEBAIHN1YiBsYXVuY2hlck5hbWUo KQogICAgICAgICByZXR1cm4gIkd0a0xhdW5jaGVyIjsKICAgICB9IGVsc2lmIChpc1F0KCkpIHsK ICAgICAgICAgcmV0dXJuICJRdExhdW5jaGVyIjsKLSAgICB9IGVsc2lmIChpc0FwcGxlTWFjV2Vi S2l0KCkgfHwgaXNDeWd3aW4oKSkgeworICAgIH0gZWxzaWYgKGlzQXBwbGVNYWNXZWJLaXQoKSB8 fCBpc0FwcGxlV2luV2ViS2l0KCkpIHsKICAgICAgICAgcmV0dXJuICJTYWZhcmkiOwogICAgIH0K IH0KIAogc3ViIGNoZWNrUmVxdWlyZWRTeXN0ZW1Db25maWcKIHsKLSAgICBpZiAoaXNBcHBsZU1h Y1dlYktpdCgpKSB7CisgICAgaWYgKGlzRGFyd2luKCkpIHsKICAgICAgICAgY2hvbXAobXkgJHBy b2R1Y3RWZXJzaW9uID0gYHN3X3ZlcnMgLXByb2R1Y3RWZXJzaW9uYCk7CiAgICAgICAgIGlmICgk cHJvZHVjdFZlcnNpb24gbHQgIjEwLjQiKSB7CiAgICAgICAgICAgICBwcmludCAiKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKlxuIjsK QEAgLTk4Miw3ICs5ODIsNyBAQCBzdWIgc2V0UGF0aEZvclJ1bm5pbmdXZWJLaXRBcHAKIHsKICAg ICBteSAoJGVudikgPSBAXzsKIAotICAgIHJldHVybiB1bmxlc3MgaXNDeWd3aW4oKTsKKyAgICBy ZXR1cm4gdW5sZXNzIGlzQXBwbGVXaW5XZWJLaXQoKTsKIAogICAgICRlbnYtPntQQVRIfSA9IGpv aW4oJzonLCBwcm9kdWN0RGlyKCksIGRpcm5hbWUoaW5zdGFsbGVkU2FmYXJpUGF0aCgpKSwgJGVu di0+e1BBVEh9IHx8ICIiKTsKIH0KQEAgLTEwMTUsNyArMTAxNSw3IEBAIHN1YiBydW5TYWZhcmkK ICAgICAgICAgfQogICAgIH0KIAotICAgIGlmIChpc0N5Z3dpbigpKSB7CisgICAgaWYgKGlzQXBw bGVXaW5XZWJLaXQoKSkgewogICAgICAgICBteSAkc2NyaXB0ID0gInJ1bi13ZWJraXQtbmlnaHRs eS5jbWQiOwogICAgICAgICBteSAkcmVzdWx0ID0gc3lzdGVtICJjcCIsICIkRmluZEJpbjo6Qmlu LyRzY3JpcHQiLCBwcm9kdWN0RGlyKCk7CiAgICAgICAgIHJldHVybiAkcmVzdWx0IGlmICRyZXN1 bHQ7Cg== 25533 2008-11-26 13:45:06 -0800 2008-11-26 15:48:54 -0800 Add support for build-webkit --chromium Add-support-for-build-webkit-chromium.patch text/plain 5867 eric NDMyOTZlNzFlZTcyOWM5YzlhZjRlODE2M2JjYWFlNGUzYTljMTA0NwpkaWZmIC0tZ2l0IGEvV2Vi S2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCmluZGV4IDJmYzM1MWUu LjgzYTdlZmMgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZworKysgYi9XZWJLaXRU b29scy9DaGFuZ2VMb2cKQEAgLTIsNiArMiwxNyBAQAogCiAgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgogCisgICAgICAgIEFkZCBzdXBwb3J0IGZvciBidWlsZC13ZWJraXQgLS1j aHJvbWl1bSAodGVzdGVkIG9uIG1hYykKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIyNTE1CisgICAgICAgIEFsc28gc2ltcGxpZmllZCBzb21lIGNvZGUg dXNpbmcgY2hlY2tBcmd2CisKKyAgICAgICAgKiBTY3JpcHRzL2J1aWxkLXdlYmtpdDoKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdGRpcnMucG06CisKKzIwMDgtMTEtMjYgIEVyaWMgU2VpZGVsICA8 ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CiAgICAgICAgIE1vcmUgcHJlLXdvcmsgZm9yIGFkZGluZyBhIGJ1aWxkLXdlYmtpdCAtLWNocm9t aXVtIHdoaWNoIHdvcmtzIG9uIE1hYyBhbmQgV2luZG93cwogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1MTUKICAgICAgICAgQ2hhbmdlIGEgZmV3IGNh bGxzIHRvIGlzQ3lnd2luIHRvIGlzQXBwbGVXaW5XZWJLaXQgYW5kIGEgZmV3IGNhbGxzIHRvIGlz QXBwbGVNYWNXZWJLaXQgdG8gaXNEYXJ3aW4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1Njcmlw dHMvYnVpbGQtd2Via2l0IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQKaW5kZXgg ZDZmMmUwYS4uMmNiZTE5MyAxMDA3NTUKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9idWlsZC13 ZWJraXQKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQKQEAgLTY4LDYgKzY4 LDcgQEAgbXkgJHVzYWdlID0gPDxFT0Y7CiBVc2FnZTogJHByb2dyYW1OYW1lIFtvcHRpb25zXSBb b3B0aW9ucyB0byBwYXNzIHRvIGJ1aWxkIHN5c3RlbV0KICAgLS1oZWxwICAgICAgICAgICAgICAg ICAgICAgICAgU2hvdyB0aGlzIGhlbHAgbWVzc2FnZQogICAtLWNhaXJvLXdpbjMyICAgICAgICAg ICAgICAgICBCdWlsZCB1c2luZyBDYWlybyAocmF0aGVyIHRoYW4gQ29yZUdyYXBoaWNzKSBvbiBX aW5kb3dzCisgIC0tY2hyb21pdW0gICAgICAgICAgICAgICAgICAgIEJ1aWxkIHRoZSBDaHJvbWl1 bSBwb3J0IG9uIE1hYy9XaW4vTGludXgKICAgLS1jbGVhbiAgICAgICAgICAgICAgICAgICAgICAg Q2xlYW51cCB0aGUgYnVpbGQgZGlyZWN0b3J5CiAgIC0tdW5pdmVyc2FsICAgICAgICAgICAgICAg ICAgIEJ1aWxkIDItd2F5IHVuaXZlcnNhbCAoUFBDIGFuZCBJbnRlbCAzMi1iaXQpCiAgIC0tNjQt Yml0ICAgICAgICAgICAgICAgICAgICAgIEJ1aWxkIDY0LWJpdCwgY29tYmluZSB3aXRoIC0tdW5p dmVyc2FsIHRvIGJ1aWxkIDQtd2F5IHVuaXZlcnNhbApAQCAtMTkyLDcgKzE5MywxMCBAQCBpZiAo JGNvdmVyYWdlU3VwcG9ydCkgewogfQogCiAjIENoZWNrIHRoYXQgYWxsIHRoZSBwcm9qZWN0IGRp cmVjdG9yaWVzIGFyZSB0aGVyZS4KLW15IEBwcm9qZWN0cyA9ICgiSmF2YVNjcmlwdENvcmUiLCAi SmF2YVNjcmlwdEdsdWUiLCAiV2ViQ29yZSIsICJXZWJLaXQiKTsKK215IEBwcm9qZWN0cyA9ICgi SmF2YVNjcmlwdENvcmUiLCAiV2ViQ29yZSIsICJXZWJLaXQiKTsKKyMgT25seSBBcHBsZSBidWls ZHMgSmF2YVNjcmlwdEdsdWUsIGFuZCBvbmx5IG9uIHRoZSBNYWMKK3B1c2ggQHByb2plY3RzLCAi SmF2YVNjcmlwdEdsdWUiIGlmIGlzQXBwbGVNYWNXZWJLaXQoKTsKKwogbXkgQG90aGVyRGlycyA9 ICgiV2ViS2l0TGlicmFyaWVzIik7CiBmb3IgbXkgJGRpciAoQHByb2plY3RzLCBAb3RoZXJEaXJz KSB7CiAgICAgaWYgKCEgLWQgJGRpcikgewpAQCAtMzE4LDYgKzMyMiw4IEBAIGZvciBteSAkZGly IChAcHJvamVjdHMpIHsKICAgICAgICAgaWYgKCRkaXIgZXEgIldlYktpdCIpIHsKICAgICAgICAg ICAgICRyZXN1bHQgPSBidWlsZFZpc3VhbFN0dWRpb1Byb2plY3QoIndpbi9XZWJLaXQudmNwcm9q L1dlYktpdC5zbG4iLCAkY2xlYW4pOwogICAgICAgICB9CisgICAgfSBlbHNpZiAoaXNDaHJvbWl1 bSgpKSB7CisgICAgICAgICRyZXN1bHQgPSBidWlsZFNjb25zUHJvamVjdCgkZGlyLCAkY2xlYW4p OwogICAgIH0KIAogICAgIGlmIChleGl0U3RhdHVzKCRyZXN1bHQpKSB7CmRpZmYgLS1naXQgYS9X ZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0gYi9XZWJLaXRUb29scy9TY3JpcHRzL3dl YmtpdGRpcnMucG0KaW5kZXggYjM1ZTgzMC4uODQ1ZDhkOCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9v bHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 ZGlycy5wbQpAQCAtMjcxLDcgKzI3MSw3IEBAIHN1YiBkZXRlcm1pbmVQYXNzZWRDb25maWd1cmF0 aW9uCiAgICAgcmV0dXJuIGlmICRzZWFyY2hlZEZvclBhc3NlZENvbmZpZ3VyYXRpb247CiAgICAg JHNlYXJjaGVkRm9yUGFzc2VkQ29uZmlndXJhdGlvbiA9IDE7CiAKLSAgICBteSAkaXNXaW5DYWly byA9IGdyZXAoL14tLWNhaXJvLXdpbjMyJC9pLCBAQVJHVik7CisgICAgbXkgJGlzV2luQ2Fpcm8g PSBjaGVja0FyZ3YoIi0tY2Fpcm8td2luMzIiKTsKIAogICAgIGZvciBteSAkaSAoMCAuLiAkI0FS R1YpIHsKICAgICAgICAgbXkgJG9wdCA9ICRBUkdWWyRpXTsKQEAgLTM2MiwxOSArMzYyLDE5IEBA IHN1YiBzYWZhcmlQYXRoCiAKIHN1YiBidWlsdER5bGliUGF0aEZvck5hbWUKIHsKLSAgICBteSAk ZnJhbWV3b3JrID0gc2hpZnQ7CisgICAgbXkgJGxpYnJhcnlOYW1lID0gc2hpZnQ7CiAgICAgZGV0 ZXJtaW5lQ29uZmlndXJhdGlvblByb2R1Y3REaXIoKTsKLSAgICBpZiAoaXNRdCgpIG9yIGlzR3Rr KCkpIHsKLSAgICAgICAgcmV0dXJuICIkY29uZmlndXJhdGlvblByb2R1Y3REaXIvJGZyYW1ld29y ayI7CisgICAgaWYgKGlzUXQoKSBvciBpc0d0aygpIG9yIGlzQ2hyb21pdW0oKSkgeworICAgICAg ICByZXR1cm4gIiRjb25maWd1cmF0aW9uUHJvZHVjdERpci8kbGlicmFyeU5hbWUiOwogICAgIH0K ICAgICBpZiAoaXNBcHBsZU1hY1dlYktpdCgpKSB7Ci0gICAgICAgIHJldHVybiAiJGNvbmZpZ3Vy YXRpb25Qcm9kdWN0RGlyLyRmcmFtZXdvcmsuZnJhbWV3b3JrL1ZlcnNpb25zL0EvJGZyYW1ld29y ayI7CisgICAgICAgIHJldHVybiAiJGNvbmZpZ3VyYXRpb25Qcm9kdWN0RGlyLyRsaWJyYXJ5TmFt ZS5mcmFtZXdvcmsvVmVyc2lvbnMvQS8kbGlicmFyeU5hbWUiOwogICAgIH0KICAgICBpZiAoaXNB cHBsZVdpbldlYktpdCgpKSB7Ci0gICAgICAgIGlmICgkZnJhbWV3b3JrIGVxICJKYXZhU2NyaXB0 Q29yZSIpIHsKLSAgICAgICAgICAgICAgICByZXR1cm4gIiRiYXNlUHJvZHVjdERpci9saWIvJGZy YW1ld29yay5saWIiOworICAgICAgICBpZiAoJGxpYnJhcnlOYW1lIGVxICJKYXZhU2NyaXB0Q29y ZSIpIHsKKyAgICAgICAgICAgIHJldHVybiAiJGJhc2VQcm9kdWN0RGlyL2xpYi8kbGlicmFyeU5h bWUubGliIjsKICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIHJldHVybiAiJGJhc2VQcm9k dWN0RGlyLyRmcmFtZXdvcmsuaW50ZXJtZWRpYXRlLyRjb25maWd1cmF0aW9uLyRmcmFtZXdvcmsu aW50ZXJtZWRpYXRlLyRmcmFtZXdvcmsubGliIjsKKyAgICAgICAgICAgIHJldHVybiAiJGJhc2VQ cm9kdWN0RGlyLyRsaWJyYXJ5TmFtZS5pbnRlcm1lZGlhdGUvJGNvbmZpZ3VyYXRpb24vJGxpYnJh cnlOYW1lLmludGVybWVkaWF0ZS8kbGlicmFyeU5hbWUubGliIjsKICAgICAgICAgfQogICAgIH0K IApAQCAtNTM4LDEyICs1MzgsNyBAQCBzdWIgaXNHdGsoKQogc3ViIGRldGVybWluZUlzR3RrKCkK IHsKICAgICByZXR1cm4gaWYgZGVmaW5lZCgkaXNHdGspOwotCi0gICAgaWYgKGNoZWNrQXJndigi LS1ndGsiKSkgewotICAgICAgICAkaXNHdGsgPSAxOwotICAgIH0gZWxzZSB7Ci0gICAgICAgICRp c0d0ayA9IDA7Ci0gICAgfQorICAgICRpc0d0ayA9IGNoZWNrQXJndigiLS1ndGsiKTsKIH0KIAog c3ViIGlzV3goKQpAQCAtNTU1LDEyICs1NTAsNyBAQCBzdWIgaXNXeCgpCiBzdWIgZGV0ZXJtaW5l SXNXeCgpCiB7CiAgICAgcmV0dXJuIGlmIGRlZmluZWQoJGlzV3gpOwotCi0gICAgaWYgKGNoZWNr QXJndigiLS13eCIpKSB7Ci0gICAgICAgICRpc1d4ID0gMTsKLSAgICB9IGVsc2UgewotICAgICAg ICAkaXNXeCA9IDA7Ci0gICAgfQorICAgICRpc1d4ID0gY2hlY2tBcmd2KCItLXd4Iik7CiB9CiAK ICMgRGV0ZXJtaW5lIGlmIHRoaXMgaXMgZGViaWFuLCB1YnVudHUsIGxpbnNwaXJlLCBvciBzb21l dGhpbmcgc2ltaWxhci4KQEAgLTU3OCwxMiArNTY4LDcgQEAgc3ViIGlzQ2hyb21pdW0oKQogc3Vi IGRldGVybWluZUlzQ2hyb21pdW0oKQogewogICAgIHJldHVybiBpZiBkZWZpbmVkKCRpc0Nocm9t aXVtKTsKLQotICAgIGlmIChjaGVja0FyZ3YoIi0tY2hyb21pdW0iKSkgewotICAgICAgICAkaXND aHJvbWl1bSA9IDE7Ci0gICAgfSBlbHNlIHsKLSAgICAgICAgJGlzQ2hyb21pdW0gPSAwOwotICAg IH0KKyAgICAkaXNDaHJvbWl1bSA9IGNoZWNrQXJndigiLS1jaHJvbWl1bSIpOwogfQogCiBzdWIg aXNDeWd3aW4oKQpAQCAtNTk2LDE4ICs1ODEsMTkgQEAgc3ViIGlzRGFyd2luKCkKICAgICByZXR1 cm4gKCReTyBlcSAiZGFyd2luIikgfHwgMDsKIH0KIAotIyBpc0FwcGxlTWFjV2ViS2l0KCkgb25s eSByZXR1cm5zIHRydWUgZm9yIEFwcGxlJ3MgcG9ydCwKLSMgbm90IGZvciBvdGhlciBwb3J0cyB0 aGF0IGNhbiBiZSBidWlsdC9ydW4gb24gT1MgWC4KK3N1YiBpc0FwcGxlV2ViS2l0KCkKK3sKKyAg ICByZXR1cm4gIShpc1F0KCkgb3IgaXNHdGsoKSBvciBpc1d4KCkgb3IgaXNDaHJvbWl1bSgpKTsK K30KKwogc3ViIGlzQXBwbGVNYWNXZWJLaXQoKQogewotICAgIHJldHVybiBpc0RhcndpbigpIGFu ZCAhKGlzUXQoKSBvciBpc0d0aygpIG9yIGlzV3goKSBvciBpc0Nocm9taXVtKCkpOworICAgIHJl dHVybiBpc0FwcGxlV2ViS2l0KCkgJiYgaXNEYXJ3aW4oKTsKIH0KIAotIyBpc0FwcGxlV2luV2Vi S2l0KCkgb25seSByZXR1cm5zIHRydWUgZm9yIEFwcGxlJ3MgcG9ydCwKLSMgbm90IGZvciBvdGhl ciBwb3J0cyB0aGF0IGNhbiBiZSBidWlsdC9ydW4gb24gV2luZG93cwogc3ViIGlzQXBwbGVXaW5X ZWJLaXQoKQogewotICAgIHJldHVybiBpc0N5Z3dpbigpIGFuZCAhKGlzUXQoKSBvciBpc0d0aygp IG9yIGlzV3goKSBvciBpc0Nocm9taXVtKCkpOworICAgIHJldHVybiBpc0FwcGxlV2ViS2l0KCkg JiYgaXNDeWd3aW4oKTsKIH0KIAogc3ViIGRldGVybWluZU9TWFZlcnNpb24oKQpAQCAtNzgzLDYg Kzc2OSwxNiBAQCBzdWIgYnVpbGRWaXN1YWxTdHVkaW9Qcm9qZWN0CiAgICAgcmV0dXJuIHN5c3Rl bSAkdmNCdWlsZFBhdGgsICR3aW5Qcm9qZWN0UGF0aCwgJGNvbW1hbmQsICRjb25maWc7CiB9CiAK K3N1YiBidWlsZFNjb25zUHJvamVjdAoreworICAgIG15ICgkcHJvamVjdCwgJHNob3VsZENsZWFu KSA9IEBfOworICAgIHByaW50ICJCdWlsZGluZyBmcm9tICRwcm9qZWN0LyRwcm9qZWN0LnNjb25z XG4iOworICAgIGlmICgkc2hvdWxkQ2xlYW4pIHsKKyAgICAgICAgcmV0dXJuIHN5c3RlbSAic2Nv bnMiLCAiLS1jbGVhbiI7CisgICAgfQorICAgIHJldHVybiBzeXN0ZW0gInNjb25zIjsKK30KKwog c3ViIHJldHJpZXZlUU1ha2VzcGVjVmFyCiB7CiAgICAgbXkgJG1rc3BlYyA9ICRfWzBdOwo= 25536 2008-11-26 14:27:05 -0800 2008-11-26 15:49:32 -0800 More cleanups changing isCygwin calls to isAppleWinWebKit and deploying isAppleWebKit where necessary. anups-changing-isCygwin-calls-to-isAppleWinWebKit-and-deploying-isAppleWebKit-where-necessary..patch text/plain 4933 eric NDA1NWZkMThmOGNjODlhYjEwODc2OTk0ZGVhNGI5MTIzYzZiMzExZQpkaWZmIC0tZ2l0IGEvV2Vi S2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCmluZGV4IDgzYTdlZmMu LjMxNzIwZmYgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZworKysgYi9XZWJLaXRU b29scy9DaGFuZ2VMb2cKQEAgLTEsNiArMSwyMSBAQAogMjAwOC0xMS0yNiAgRXJpYyBTZWlkZWwg IDxlcmljQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisgICAgICAgIAorICAgICAgICBBZGQgc3VwcG9ydCBmb3IgYnVpbGQtd2Via2l0IC0tY2hyb21p dW0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNTE1 CisgICAgICAgIE1vcmUgY2xlYW51cHMgY2hhbmdpbmcgaXNDeWd3aW4gY2FsbHMgdG8gaXNBcHBs ZVdpbldlYktpdCBhbmQgZGVwbG95aW5nIGlzQXBwbGVXZWJLaXQgd2hlcmUgbmVjZXNzYXJ5Lgor CisgICAgICAgICogU2NyaXB0cy9idWlsZC1kdW1wcmVuZGVydHJlZToKKyAgICAgICAgKiBTY3Jp cHRzL2J1aWxkLWpzYzoKKyAgICAgICAgKiBTY3JpcHRzL2J1aWxkLXdlYmtpdDoKKyAgICAgICAg KiBTY3JpcHRzL2dkYi1zYWZhcmk6CisgICAgICAgICogU2NyaXB0cy9ydW4td2Via2l0LXRlc3Rz OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbToKKworMjAwOC0xMS0yNiAgRXJpYyBT ZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCiAKICAgICAgICAgQWRkIHN1cHBvcnQgZm9yIGJ1aWxkLXdlYmtpdCAtLWNocm9taXVt ICh0ZXN0ZWQgb24gbWFjKQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjI1MTUKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVpbGQtZHVt cHJlbmRlcnRyZWUgYi9XZWJLaXRUb29scy9TY3JpcHRzL2J1aWxkLWR1bXByZW5kZXJ0cmVlCmlu ZGV4IGQyMDYwNWYuLjQ2ZTg2ZTAgMTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVp bGQtZHVtcHJlbmRlcnRyZWUKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9idWlsZC1kdW1wcmVu ZGVydHJlZQpAQCAtNDMsNyArNDMsNyBAQCBjaGRpciAiV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRy ZWUiIG9yIGRpZTsKIG15ICRyZXN1bHQ7CiBpZiAoaXNBcHBsZU1hY1dlYktpdCgpKSB7CiAgICAg JHJlc3VsdCA9IHN5c3RlbSAieGNvZGVidWlsZCIsICItcHJvamVjdCIsICJEdW1wUmVuZGVyVHJl ZS54Y29kZXByb2oiLCBAb3B0aW9ucywgQEFSR1Y7Ci19IGVsc2lmIChpc0N5Z3dpbigpKSB7Cit9 IGVsc2lmIChpc0FwcGxlV2luV2ViS2l0KCkpIHsKICAgICAkcmVzdWx0ID0gYnVpbGRWaXN1YWxT dHVkaW9Qcm9qZWN0KCJEdW1wUmVuZGVyVHJlZS5zbG4iKTsKIH0gZWxzaWYgKGlzUXQoKSB8fCBp c0d0aygpKSB7CiAgICAgIyBRdCBhbmQgR3RrIGJ1aWxkIGV2ZXJ5dGhpbmcgaW4gb25lIHNob3Qu IE5vIG5lZWQgdG8gYnVpbGQgYW55dGhpbmcgaGVyZS4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xz L1NjcmlwdHMvYnVpbGQtanNjIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9idWlsZC1qc2MKaW5kZXgg ODkwOTBiMi4uNTZiMDQ3ZSAxMDA3NTUKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9idWlsZC1q c2MKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9idWlsZC1qc2MKQEAgLTQzLDcgKzQzLDcgQEAg Y2hkaXIgIkphdmFTY3JpcHRDb3JlIiBvciBkaWUgIkNhbid0IGZpbmQgSmF2YVNjcmlwdENvcmUg ZGlyZWN0b3J5IHRvIGJ1aWxkIGZyb20KIG15ICRyZXN1bHQ7CiBpZiAoaXNBcHBsZU1hY1dlYktp dCgpKSB7CiAgICAgJHJlc3VsdCA9IHN5c3RlbSAic2giLCAiLWMiLCAneGNvZGVidWlsZCAtcHJv amVjdCBKYXZhU2NyaXB0Q29yZS54Y29kZXByb2ogLXRhcmdldCBqc2MgIiRAIiB8IGdyZXAgLXYg c2V0ZW52ICYmIGV4aXQgJHtQSVBFU1RBVFVTWzBdfScsICJ4Y29kZWJ1aWxkIiwgIEBvcHRpb25z LCBAQVJHVjsKLX0gZWxzaWYgKGlzQ3lnd2luKCkpIHsKK30gZWxzaWYgKGlzQXBwbGVXaW5XZWJL aXQoKSkgewogICAgICRyZXN1bHQgPSBidWlsZFZpc3VhbFN0dWRpb1Byb2plY3QoIkphdmFTY3Jp cHRDb3JlLnZjcHJvai9KYXZhU2NyaXB0Q29yZS5zbG4iKTsKIH0gZWxzaWYgKGlzUXQoKSBvciBp c0d0aygpIG9yIGlzV3goKSkgewogICAgICMgUXQgYW5kIEd0ayBidWlsZCBldmVyeXRoaW5nIGlu IG9uZS1zaG90LiBObyBuZWVkIHRvIGJ1aWxkIGFueXRoaW5nIGhlcmUuCmRpZmYgLS1naXQgYS9X ZWJLaXRUb29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdCBiL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVp bGQtd2Via2l0CmluZGV4IDJjYmUxOTMuLmI0ZGU5ZGIgMTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xz L1NjcmlwdHMvYnVpbGQtd2Via2l0CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Vi a2l0CkBAIC01Niw4ICs1Niw4IEBAIG15ICR4cGF0aFN1cHBvcnQgPSAxOwogbXkgJHhzbHRTdXBw b3J0ID0gMTsKIG15ICR3bWxTdXBwb3J0ID0gMDsKIG15ICRjb3ZlcmFnZVN1cHBvcnQgPSAwOwot bXkgJHZpZGVvU3VwcG9ydCA9IChpc0FwcGxlTWFjV2ViS2l0KCkgfHwgaXNBcHBsZVdpbldlYktp dCgpKTsgIyBFbmFibGUgYnkgZGVmYXVsdCBvbiBPU1ggYW5kIFdpbmRvd3MKLW15ICR3b3JrZXJz U3VwcG9ydCA9IChpc0FwcGxlTWFjV2ViS2l0KCkgfHwgaXNBcHBsZVdpbldlYktpdCgpIHx8IGlz R3RrKCkpOyAjIEVuYWJsZSBieSBkZWZhdWx0IG9uIE9TWCwgV2luZG93cyBhbmQgR3RrKworbXkg JHZpZGVvU3VwcG9ydCA9IGlzQXBwbGVXZWJLaXQoKTsgIyBFbmFibGUgYnkgZGVmYXVsdCBmb3Ig QXBwbGUncyBidWlsZHMKK215ICR3b3JrZXJzU3VwcG9ydCA9IChpc0FwcGxlV2ViS2l0KCkgfHwg aXNHdGsoKSk7ICMgRW5hYmxlIGJ5IGRlZmF1bHQgZm9yIEFwcGxlJ3MgYnVpbGRzIChtYWMvd2lu KSBhbmQgR3RrKwogbXkgJHNob3dIZWxwID0gMDsKIG15ICRjbGVhbiA9IDA7CiBteSAkYnVpbGRV bml2ZXJzYWwgPSAwOwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9ydW4td2Via2l0 LXRlc3RzIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9ydW4td2Via2l0LXRlc3RzCmluZGV4IDc3MmI0 NjQuLmY3ZjUwMzkgMTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvcnVuLXdlYmtpdC10 ZXN0cworKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3J1bi13ZWJraXQtdGVzdHMKQEAgLTEwMDcs NyArMTAwNyw3IEBAIGlmIChpc1F0KCkpIHsKICAgc3lzdGVtICJXZWJLaXRUb29scy9TY3JpcHRz L3J1bi1sYXVuY2hlciIsICItLXF0IiwgJGNvbmZpZ3VyYXRpb25PcHRpb24sICR0ZXN0UmVzdWx0 cyBpZiAkbGF1bmNoU2FmYXJpOwogfSBlbHNpZiAoaXNHdGsoKSkgewogICBzeXN0ZW0gIldlYktp dFRvb2xzL1NjcmlwdHMvcnVuLWxhdW5jaGVyIiwgIi0tZ3RrIiwgJGNvbmZpZ3VyYXRpb25PcHRp b24sICR0ZXN0UmVzdWx0cyBpZiAkbGF1bmNoU2FmYXJpOwotfSBlbHNpZiAoaXNDeWd3aW4oKSkg eworfSBlbHNpZiAoaXNBcHBsZVdpbldlYktpdCgpKSB7CiAgIHN5c3RlbSAiY3lnc3RhcnQiLCAk dGVzdFJlc3VsdHMgaWYgJGxhdW5jaFNhZmFyaTsKIH0gZWxzZSB7CiAgIHN5c3RlbSAiV2ViS2l0 VG9vbHMvU2NyaXB0cy9ydW4tc2FmYXJpIiwgJGNvbmZpZ3VyYXRpb25PcHRpb24sICItTlNPcGVu IiwgJHRlc3RSZXN1bHRzIGlmICRsYXVuY2hTYWZhcmk7CkBAIC0xMzQzLDcgKzEzNDMsNyBAQCBz dWIgb3BlbkhUVFBESWZOZWVkZWQoKQogICAgICk7CiAKICAgICAjIEZJWE1FOiBFbmFibGUgdGhp cyBvbiBXaW5kb3dzIG9uY2UgPHJkYXI6Ly9wcm9ibGVtLzUzNDU5ODU+IGlzIGZpeGVkCi0gICAg cHVzaChAYXJncywgIi1jIiwgIlNTTENlcnRpZmljYXRlRmlsZSBcIiRzc2xDZXJ0aWZpY2F0ZVwi IikgdW5sZXNzIGlzQ3lnd2luKCk7CisgICAgcHVzaChAYXJncywgIi1jIiwgIlNTTENlcnRpZmlj YXRlRmlsZSBcIiRzc2xDZXJ0aWZpY2F0ZVwiIikgdW5sZXNzIGlzQXBwbGVXaW5XZWJLaXQoKTsK IAogICAgIG9wZW4yKFwqSFRUUERJTiwgXCpIVFRQRE9VVCwgJGh0dHBkUGF0aCwgQGFyZ3MpOwog CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0gYi9XZWJLaXRU b29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KaW5kZXggODQ1ZDhkOC4uM2VkZGEwOSAxMDA2NDQK LS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCisrKyBiL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0ZGlycy5wbQpAQCAtNjUwLDcgKzY1MCw3IEBAIHN1YiBsYXVuY2hlclBh dGgoKQogICAgIG15ICRyZWxhdGl2ZVNjcmlwdHNQYXRoID0gcmVsYXRpdmVTY3JpcHRzRGlyKCk7 CiAgICAgaWYgKGlzR3RrKCkgfHwgaXNRdCgpKSB7CiAgICAgICAgIHJldHVybiAiJHJlbGF0aXZl U2NyaXB0c1BhdGgvcnVuLWxhdW5jaGVyIjsKLSAgICB9IGVsc2lmIChpc0FwcGxlTWFjV2ViS2l0 KCkgfHwgaXNBcHBsZVdpbldlYktpdCgpKSB7CisgICAgfSBlbHNpZiAoaXNBcHBsZVdlYktpdCgp KSB7CiAgICAgICAgIHJldHVybiAiJHJlbGF0aXZlU2NyaXB0c1BhdGgvcnVuLXNhZmFyaSI7CiAg ICAgfQogfQpAQCAtNjYxLDcgKzY2MSw3IEBAIHN1YiBsYXVuY2hlck5hbWUoKQogICAgICAgICBy ZXR1cm4gIkd0a0xhdW5jaGVyIjsKICAgICB9IGVsc2lmIChpc1F0KCkpIHsKICAgICAgICAgcmV0 dXJuICJRdExhdW5jaGVyIjsKLSAgICB9IGVsc2lmIChpc0FwcGxlTWFjV2ViS2l0KCkgfHwgaXNB cHBsZVdpbldlYktpdCgpKSB7CisgICAgfSBlbHNpZiAoaXNBcHBsZVdlYktpdCgpKSB7CiAgICAg ICAgIHJldHVybiAiU2FmYXJpIjsKICAgICB9CiB9Cg==