77118 2012-01-26 10:35:07 -0800 [Qt][Mac] Build fails after adding ICU support (r105997). 2012-01-27 06:42:24 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zeno zeno jesus vestbo oldest_to_newest 543249 0 zeno 2012-01-26 10:35:07 -0800 Mac OS does not officially provide libicu. Even though the library is actually being shipped with the OS, the headers are missing. The WebKit repository therefore includes matching headers for libicu on Mac OS. We should use these, as the Apple port does, and link to the library provided by the OS. 543319 1 124153 zeno 2012-01-26 11:24:46 -0800 Created attachment 124153 patch for review. 543331 2 124153 vestbo 2012-01-26 11:35:28 -0800 Comment on attachment 124153 patch for review. View in context: https://bugs.webkit.org/attachment.cgi?id=124153&action=review > Source/WTF/WTF.pri:29 > -haveQt(5):contains(QT_CONFIG,icu) { > - unix:!mac: LIBS += $$system(icu-config --ldflags-searchpath --ldflags-libsonly) > - else: LIBS += -licuin > +haveQt(5):if(contains(QT_CONFIG,icu)|mac) { > + unix { > + mac: { > + INCLUDEPATH += $${ROOT_WEBKIT_DIR}/Source/WTF/icu > + LIBS += -licucore > + } else: LIBS += $$system(icu-config --ldflags-searchpath --ldflags-libsonly) > + } else: LIBS += -licuin > } else { > haveQt(5): error("To build QtWebKit with Qt 5 you need ICU") > } What about Qt4? If that's handled already, I'd like to see this in a haveQt(5) { } block, instead of the checks and errors both prefixed. Also, no need for : when you do {. And since you break the mac bits into multiple lines, please also break the else. makes it easier to read. 543381 3 124162 zeno 2012-01-26 12:29:42 -0800 Created attachment 124162 patch for review. 543530 4 124162 kenneth 2012-01-26 15:05:17 -0800 Comment on attachment 124162 patch for review. View in context: https://bugs.webkit.org/attachment.cgi?id=124162&action=review Looks ok, but maybe someone has better ideas as I am no build expert :) Maybe stupid question but could icu be part of QT_CONFIG if on mac? instead of doing all those |mac > Source/WTF/WTF.pri:24 > + mac { > + INCLUDEPATH += $${ROOT_WEBKIT_DIR}/Source/WTF/icu > + LIBS += -licucore > + } else { indendation seems wrong here 543911 5 zeno 2012-01-27 02:09:57 -0800 (In reply to comment #4) > (From update of attachment 124162 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=124162&action=review > > Looks ok, but maybe someone has better ideas as I am no build expert :) Maybe stupid question but could icu be part of QT_CONFIG if on mac? instead of doing all those |mac I don't think it is an option to alter QT_CONFIG for that purpose from our side. QT_CONFIG is the configuration of Qt itself. Ideally of course Qt would already have been compiled with icu support on mac. But it is obviously a rather controversial topic to rely on a library where the headers are not shipping with the OS / developer offering. Nevertheless i think it is safe for us to do so, because we already provide the missing headers in WebKit. > > > Source/WTF/WTF.pri:24 > > + mac { > > + INCLUDEPATH += $${ROOT_WEBKIT_DIR}/Source/WTF/icu > > + LIBS += -licucore > > + } else { > > indendation seems wrong here I will fix that one. :) 544005 6 124300 zeno 2012-01-27 06:02:03 -0800 Created attachment 124300 patch for review. - rebased and fixed indentation. 544009 7 124300 vestbo 2012-01-27 06:06:45 -0800 Comment on attachment 124300 patch for review. - rebased and fixed indentation. View in context: https://bugs.webkit.org/attachment.cgi?id=124300&action=review r=me with some comments sprinkled around and tiny fix > Source/WTF/WTF.pri:22 > + INCLUDEPATH += $${ROOT_WEBKIT_DIR}/Source/WTF/icu Perhaps a comment here about why we're getting the headers from the webkit sources, but the lib from the system. > Source/WTF/WTF.pri:29 > + haveQt(5): error("To build QtWebKit with Qt 5 you need ICU") Already in haveQt(5) scope, no need for this one > Source/WebCore/Target.pri:2874 > + SOURCES += editing/SmartReplaceCF.cpp Perhaps a comment on why we use the CF one on mac (that it matches what the mac port does) > Tools/qmake/mkspecs/features/features.prf:33 > +haveQt(5):if(contains(QT_CONFIG,icu)|mac) { Perhaps a comment on why we don't rely on QT_CONFIG for mac (since it's not an official support for all of qt) 544029 8 zeno 2012-01-27 06:42:24 -0800 Committed r106118: <http://trac.webkit.org/changeset/106118> 124153 2012-01-26 11:24:46 -0800 2012-01-26 12:29:42 -0800 patch for review. 77118_20120126-202320.patch text/plain 5446 zeno ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDY1ODRiMzguLmRjNGFiYzIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTAxLTI2ICBaZW5vIEFsYmlzc2Vy ICA8emVub0B3ZWJraXQub3JnPgorCisgICAgICAgIFtRdF1bTWFjXSBCdWlsZCBmYWlscyBhZnRl ciBhZGRpbmcgSUNVIHN1cHBvcnQgKHIxMDU5OTcpLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzcxMTgKKworICAgICAgICBVc2UgQXBwbGUgY29kZSBw YXRoIGZvciB1bmljb2RlIGRhdGUgZm9ybWF0cyBvbiBtYWMuCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBydW50aW1lL0RhdGVQcm90b3R5cGUuY3Bw OgorICAgICAgICAoKToKKwogMjAxMi0wMS0yNiAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3 ZWJraXQub3JnPgogCiAgICAgICAgIFtRdF1bV2luXSBPbmUgbW9yZSBzcGVjdWxhdGl2ZSBidWls ZGZpeCBhZnRlciByMTA1OTcwLgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1 bnRpbWUvRGF0ZVByb3RvdHlwZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9E YXRlUHJvdG90eXBlLmNwcAppbmRleCAwNmI1NTNjLi43NGY0ZjM0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9EYXRlUHJvdG90eXBlLmNwcAorKysgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9EYXRlUHJvdG90eXBlLmNwcApAQCAtNjAsNyArNjAsNyBA QAogI2luY2x1ZGUgPHN5cy90aW1lYi5oPgogI2VuZGlmCiAKLSNpZiBQTEFURk9STShNQUMpIHx8 IFBMQVRGT1JNKElPUykKKyNpZiBQTEFURk9STShNQUMpIHx8IFBMQVRGT1JNKElPUykgfHwgKFBM QVRGT1JNKFFUKSAmJiBPUyhEQVJXSU4pKQogI2luY2x1ZGUgPENvcmVGb3VuZGF0aW9uL0NvcmVG b3VuZGF0aW9uLmg+CiAjZWxpZiBVU0UoSUNVX1VOSUNPREUpCiAjaW5jbHVkZSA8dW5pY29kZS91 ZGF0Lmg+CkBAIC0xMzAsNyArMTMwLDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAKIGVudW0gTG9jYWxl RGF0ZVRpbWVGb3JtYXQgeyBMb2NhbGVEYXRlQW5kVGltZSwgTG9jYWxlRGF0ZSwgTG9jYWxlVGlt ZSB9OwogIAotI2lmIFBMQVRGT1JNKE1BQykgfHwgUExBVEZPUk0oSU9TKQorI2lmIFBMQVRGT1JN KE1BQykgfHwgUExBVEZPUk0oSU9TKSB8fCAoUExBVEZPUk0oUVQpICYmIE9TKERBUldJTikpCiAK IC8vIEZJWE1FOiBTaW5jZSB0aGlzIGlzIHN1cGVyaW9yIHRvIHRoZSBzdHJmdGltZS1iYXNlZCB2 ZXJzaW9uLCB3aHkgbGltaXQgdGhpcyB0byBQTEFURk9STShNQUMpPwogLy8gSW5zdGVhZCB3ZSBz aG91bGQgY29uc2lkZXIgdXNpbmcgdGhpcyB3aGVuZXZlciBVU0UoQ0YpIGlzIHRydWUuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5nZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4 IGQ0NGFkZjcuLjg2ZDU0OTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XVEYvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTItMDEtMjYgIFplbm8g QWxiaXNzZXIgIDx6ZW5vQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW1F0XVtNYWNdIEJ1aWxkIGZh aWxzIGFmdGVyIGFkZGluZyBJQ1Ugc3VwcG9ydCAocjEwNTk5NykuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NzExOAorCisgICAgICAgIExpbmsgdG8g bGliaWN1Y29yZSBpZiBwbGF0Zm9ybSBNYWMuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBXVEYucHJpOgorCiAyMDEyLTAxLTI2ICBKZXN1cyBTYW5j aGV6LVBhbGVuY2lhICA8amVzdXMucGFsZW5jaWFAb3BlbmJvc3NhLm9yZz4KIAogICAgICAgICBb UXRdIFVzZSBJQ1UgaWYgYXZhaWxhYmxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL1dURi5wcmkg Yi9Tb3VyY2UvV1RGL1dURi5wcmkKaW5kZXggOTNiYmU5Mi4uMjQwZjQ2YyAxMDA2NDQKLS0tIGEv U291cmNlL1dURi9XVEYucHJpCisrKyBiL1NvdXJjZS9XVEYvV1RGLnByaQpAQCAtMTcsOSArMTcs MTMgQEAgSU5DTFVERVBBVEggKz0gXAogICAgICQkT0xEX1NPVVJDRV9ESVIvcXQgXAogICAgICQk T0xEX1NPVVJDRV9ESVIvdW5pY29kZQogCi1oYXZlUXQoNSk6Y29udGFpbnMoUVRfQ09ORklHLGlj dSkgewotICAgIHVuaXg6IW1hYzogTElCUyArPSAkJHN5c3RlbShpY3UtY29uZmlnIC0tbGRmbGFn cy1zZWFyY2hwYXRoIC0tbGRmbGFncy1saWJzb25seSkKLSAgICBlbHNlOiBMSUJTICs9IC1saWN1 aW4KK2hhdmVRdCg1KTppZihjb250YWlucyhRVF9DT05GSUcsaWN1KXxtYWMpIHsKKyAgICB1bml4 IHsKKyAgICAgICAgbWFjOiB7CisgICAgICAgICAgICBJTkNMVURFUEFUSCArPSAkJHtST09UX1dF QktJVF9ESVJ9L1NvdXJjZS9XVEYvaWN1CisgICAgICAgICAgICBMSUJTICs9IC1saWN1Y29yZQor ICAgICAgICB9IGVsc2U6IExJQlMgKz0gJCRzeXN0ZW0oaWN1LWNvbmZpZyAtLWxkZmxhZ3Mtc2Vh cmNocGF0aCAtLWxkZmxhZ3MtbGlic29ubHkpCisgICAgfSBlbHNlOiBMSUJTICs9IC1saWN1aW4K IH0gZWxzZSB7CiAgICAgaGF2ZVF0KDUpOiBlcnJvcigiVG8gYnVpbGQgUXRXZWJLaXQgd2l0aCBR dCA1IHlvdSBuZWVkIElDVSIpCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTdmYTYyMS4uYTJiODc3MSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTAxLTI2ICBaZW5vIEFsYmlzc2VyICA8emVu b0B3ZWJraXQub3JnPgorCisgICAgICAgIFtRdF1bTWFjXSBCdWlsZCBmYWlscyBhZnRlciBhZGRp bmcgSUNVIHN1cHBvcnQgKHIxMDU5OTcpLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NzcxMTgKKworICAgICAgICBVc2UgU21hcmVSZXBsYWNlSUNVLmNw cCBjb2RlIHBhdGggaWYgcGxhdGZvcm0gTWFjLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogVGFyZ2V0LnByaToKKyAgICAgICAgKiBlZGl0aW5nL1Nt YXJ0UmVwbGFjZUlDVS5jcHA6CisKIDIwMTItMDEtMjYgIE5pa29sYXMgWmltbWVybWFubiAgPG56 aW1tZXJtYW5uQHJpbS5jb20+CiAKICAgICAgICAgU1ZHICsgPG9iamVjdD4gdGVzdHMgYXJlIGZs YWtleQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvVGFyZ2V0LnByaSBiL1NvdXJjZS9XZWJD b3JlL1RhcmdldC5wcmkKaW5kZXggNmI2YTE0Yi4uOTYzZjVlNiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvVGFyZ2V0LnByaQorKysgYi9Tb3VyY2UvV2ViQ29yZS9UYXJnZXQucHJpCkBAIC0y ODcwLDggKzI4NzAsOSBAQCBtYWMgewogICAgICAgICBwbGF0Zm9ybS90ZXh0L2NmL1N0cmluZ0lt cGxDRi5jcHAKIH0KIAotaGF2ZVF0KDUpOmNvbnRhaW5zKFFUX0NPTkZJRyxpY3UpIHsKK2hhdmVR dCg1KTppZihjb250YWlucyhRVF9DT05GSUcsaWN1KXxtYWMpIHsKICAgICBTT1VSQ0VTICs9IHBs YXRmb3JtL3RleHQvVGV4dEJyZWFrSXRlcmF0b3JJQ1UuY3BwCisgICAgSU5DTFVERVBBVEggKz0g JCRQV0QvaWN1CiB9IGVsc2UgewogICAgIFNPVVJDRVMgKz0gcGxhdGZvcm0vdGV4dC9xdC9UZXh0 QnJlYWtJdGVyYXRvclF0LmNwcAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGlu Zy9TbWFydFJlcGxhY2VJQ1UuY3BwIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9TbWFydFJlcGxh Y2VJQ1UuY3BwCmluZGV4IGMzNTA3YWQuLjQ4MmY4MDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2VkaXRpbmcvU21hcnRSZXBsYWNlSUNVLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL1NtYXJ0UmVwbGFjZUlDVS5jcHAKQEAgLTMwLDcgKzMwLDcgQEAKICNpbmNsdWRlICJjb25m aWcuaCIKICNpbmNsdWRlICJTbWFydFJlcGxhY2UuaCIKIAotI2lmICFVU0UoQ0YpICYmIFVTRShJ Q1VfVU5JQ09ERSkKKyNpZiAoIVVTRShDRikgJiYgVVNFKElDVV9VTklDT0RFKSkgfHwgKFBMQVRG T1JNKFFUKSAmJiBPUyhEQVJXSU4pKQogI2luY2x1ZGUgIlBsYXRmb3JtU3RyaW5nLmgiCiAjaW5j bHVkZSA8dW5pY29kZS91c2V0Lmg+CiAjaW5jbHVkZSA8d3RmL0Fzc2VydGlvbnMuaD4KZGlmZiAt LWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzZGZiODlkLi5j Yjk1MDYwIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTQgQEAKKzIwMTItMDEtMjYgIFplbm8gQWxiaXNzZXIgIDx6ZW5vQHdlYmtp dC5vcmc+CisKKyAgICAgICAgW1F0XVtNYWNdIEJ1aWxkIGZhaWxzIGFmdGVyIGFkZGluZyBJQ1Ug c3VwcG9ydCAocjEwNTk5NykuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD03NzExOAorCisgICAgICAgIERlZmluZSBXVEZfVVNFX0lDVV9VTklDT0RFIGlm IHdlIGFyZSBvbiBtYWMuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBxbWFrZS9ta3NwZWNzL2ZlYXR1cmVzL2ZlYXR1cmVzLnByZjoKKwogMjAxMi0w MS0yNiAgSmVzdXMgU2FuY2hlei1QYWxlbmNpYSAgPGplc3VzLnBhbGVuY2lhQG9wZW5ib3NzYS5v cmc+CiAKICAgICAgICAgW1F0XSBVc2UgSUNVIGlmIGF2YWlsYWJsZQpkaWZmIC0tZ2l0IGEvVG9v bHMvcW1ha2UvbWtzcGVjcy9mZWF0dXJlcy9mZWF0dXJlcy5wcmYgYi9Ub29scy9xbWFrZS9ta3Nw ZWNzL2ZlYXR1cmVzL2ZlYXR1cmVzLnByZgppbmRleCBmZTIwZmRiLi44MDYxMDNlIDEwMDY0NAot LS0gYS9Ub29scy9xbWFrZS9ta3NwZWNzL2ZlYXR1cmVzL2ZlYXR1cmVzLnByZgorKysgYi9Ub29s cy9xbWFrZS9ta3NwZWNzL2ZlYXR1cmVzL2ZlYXR1cmVzLnByZgpAQCAtMzAsNyArMzAsNyBAQCBp c0VtcHR5KFNRTElURTNTUkNESVIpIHsKICAgICBTUUxJVEUzU1JDRElSID0gJCRbUVRfSU5TVEFM TF9QUkVGSVhdL3NyYy8zcmRwYXJ0eS9zcWxpdGUvCiB9CiAKLWhhdmVRdCg1KTpjb250YWlucyhR VF9DT05GSUcsaWN1KSB7CitoYXZlUXQoNSk6aWYoY29udGFpbnMoUVRfQ09ORklHLGljdSl8bWFj KSB7CiAgICAgREVGSU5FUyArPSBXVEZfVVNFX0lDVV9VTklDT0RFPTEKICAgICBERUZJTkVTIC09 IFdURl9VU0VfUVQ0X1VOSUNPREUKIH0gZWxzZSB7Cg== 124162 2012-01-26 12:29:42 -0800 2012-01-27 06:02:03 -0800 patch for review. 77118_20120126-210853.patch text/plain 6016 zeno ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDY1ODRiMzguLmRjNGFiYzIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTAxLTI2ICBaZW5vIEFsYmlzc2Vy ICA8emVub0B3ZWJraXQub3JnPgorCisgICAgICAgIFtRdF1bTWFjXSBCdWlsZCBmYWlscyBhZnRl ciBhZGRpbmcgSUNVIHN1cHBvcnQgKHIxMDU5OTcpLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzcxMTgKKworICAgICAgICBVc2UgQXBwbGUgY29kZSBw YXRoIGZvciB1bmljb2RlIGRhdGUgZm9ybWF0cyBvbiBtYWMuCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBydW50aW1lL0RhdGVQcm90b3R5cGUuY3Bw OgorICAgICAgICAoKToKKwogMjAxMi0wMS0yNiAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3 ZWJraXQub3JnPgogCiAgICAgICAgIFtRdF1bV2luXSBPbmUgbW9yZSBzcGVjdWxhdGl2ZSBidWls ZGZpeCBhZnRlciByMTA1OTcwLgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1 bnRpbWUvRGF0ZVByb3RvdHlwZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9E YXRlUHJvdG90eXBlLmNwcAppbmRleCAwNmI1NTNjLi43NGY0ZjM0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9EYXRlUHJvdG90eXBlLmNwcAorKysgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9EYXRlUHJvdG90eXBlLmNwcApAQCAtNjAsNyArNjAsNyBA QAogI2luY2x1ZGUgPHN5cy90aW1lYi5oPgogI2VuZGlmCiAKLSNpZiBQTEFURk9STShNQUMpIHx8 IFBMQVRGT1JNKElPUykKKyNpZiBQTEFURk9STShNQUMpIHx8IFBMQVRGT1JNKElPUykgfHwgKFBM QVRGT1JNKFFUKSAmJiBPUyhEQVJXSU4pKQogI2luY2x1ZGUgPENvcmVGb3VuZGF0aW9uL0NvcmVG b3VuZGF0aW9uLmg+CiAjZWxpZiBVU0UoSUNVX1VOSUNPREUpCiAjaW5jbHVkZSA8dW5pY29kZS91 ZGF0Lmg+CkBAIC0xMzAsNyArMTMwLDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAKIGVudW0gTG9jYWxl RGF0ZVRpbWVGb3JtYXQgeyBMb2NhbGVEYXRlQW5kVGltZSwgTG9jYWxlRGF0ZSwgTG9jYWxlVGlt ZSB9OwogIAotI2lmIFBMQVRGT1JNKE1BQykgfHwgUExBVEZPUk0oSU9TKQorI2lmIFBMQVRGT1JN KE1BQykgfHwgUExBVEZPUk0oSU9TKSB8fCAoUExBVEZPUk0oUVQpICYmIE9TKERBUldJTikpCiAK IC8vIEZJWE1FOiBTaW5jZSB0aGlzIGlzIHN1cGVyaW9yIHRvIHRoZSBzdHJmdGltZS1iYXNlZCB2 ZXJzaW9uLCB3aHkgbGltaXQgdGhpcyB0byBQTEFURk9STShNQUMpPwogLy8gSW5zdGVhZCB3ZSBz aG91bGQgY29uc2lkZXIgdXNpbmcgdGhpcyB3aGVuZXZlciBVU0UoQ0YpIGlzIHRydWUuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5nZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4 IGQ0NGFkZjcuLjg2ZDU0OTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XVEYvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTItMDEtMjYgIFplbm8g QWxiaXNzZXIgIDx6ZW5vQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW1F0XVtNYWNdIEJ1aWxkIGZh aWxzIGFmdGVyIGFkZGluZyBJQ1Ugc3VwcG9ydCAocjEwNTk5NykuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NzExOAorCisgICAgICAgIExpbmsgdG8g bGliaWN1Y29yZSBpZiBwbGF0Zm9ybSBNYWMuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBXVEYucHJpOgorCiAyMDEyLTAxLTI2ICBKZXN1cyBTYW5j aGV6LVBhbGVuY2lhICA8amVzdXMucGFsZW5jaWFAb3BlbmJvc3NhLm9yZz4KIAogICAgICAgICBb UXRdIFVzZSBJQ1UgaWYgYXZhaWxhYmxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL1dURi5wcmkg Yi9Tb3VyY2UvV1RGL1dURi5wcmkKaW5kZXggOTNiYmU5Mi4uODJlMGM3OSAxMDA2NDQKLS0tIGEv U291cmNlL1dURi9XVEYucHJpCisrKyBiL1NvdXJjZS9XVEYvV1RGLnByaQpAQCAtMTcsMTEgKzE3 LDE4IEBAIElOQ0xVREVQQVRIICs9IFwKICAgICAkJE9MRF9TT1VSQ0VfRElSL3F0IFwKICAgICAk JE9MRF9TT1VSQ0VfRElSL3VuaWNvZGUKIAotaGF2ZVF0KDUpOmNvbnRhaW5zKFFUX0NPTkZJRyxp Y3UpIHsKLSAgICB1bml4OiFtYWM6IExJQlMgKz0gJCRzeXN0ZW0oaWN1LWNvbmZpZyAtLWxkZmxh Z3Mtc2VhcmNocGF0aCAtLWxkZmxhZ3MtbGlic29ubHkpCi0gICAgZWxzZTogTElCUyArPSAtbGlj dWluCi19IGVsc2UgewotICAgIGhhdmVRdCg1KTogZXJyb3IoIlRvIGJ1aWxkIFF0V2ViS2l0IHdp dGggUXQgNSB5b3UgbmVlZCBJQ1UiKQoraGF2ZVF0KDUpIHsKKyAgICBtYWMgeworICAgICAgICAg ICAgSU5DTFVERVBBVEggKz0gJCR7Uk9PVF9XRUJLSVRfRElSfS9Tb3VyY2UvV1RGL2ljdQorICAg ICAgICAgICAgTElCUyArPSAtbGljdWNvcmUKKyAgICB9IGVsc2UgeworICAgICAgICBjb250YWlu cyhRVF9DT05GSUcsaWN1KSB7CisgICAgICAgICAgICB1bml4OiBMSUJTICs9ICQkc3lzdGVtKGlj dS1jb25maWcgLS1sZGZsYWdzLXNlYXJjaHBhdGggLS1sZGZsYWdzLWxpYnNvbmx5KQorICAgICAg ICAgICAgZWxzZTogTElCUyArPSAtbGljdWluCisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAg ICBoYXZlUXQoNSk6IGVycm9yKCJUbyBidWlsZCBRdFdlYktpdCB3aXRoIFF0IDUgeW91IG5lZWQg SUNVIikKKyAgICAgICAgfQorICAgIH0KIH0KIAogdjggewpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDE3ZmE2MjEu LjI3N2FkNDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMi0wMS0yNiAgWmVubyBB bGJpc3NlciAgPHplbm9Ad2Via2l0Lm9yZz4KKworICAgICAgICBbUXRdW01hY10gQnVpbGQgZmFp bHMgYWZ0ZXIgYWRkaW5nIElDVSBzdXBwb3J0IChyMTA1OTk3KS4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc3MTE4CisKKyAgICAgICAgVXNlIFNtYXJl UmVwbGFjZUNGLmNwcCBjb2RlIHBhdGggaWYgcGxhdGZvcm0gTWFjLgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGFyZ2V0LnByaToKKwogMjAxMi0w MS0yNiAgTmlrb2xhcyBaaW1tZXJtYW5uICA8bnppbW1lcm1hbm5AcmltLmNvbT4KIAogICAgICAg ICBTVkcgKyA8b2JqZWN0PiB0ZXN0cyBhcmUgZmxha2V5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9UYXJnZXQucHJpIGIvU291cmNlL1dlYkNvcmUvVGFyZ2V0LnByaQppbmRleCA2YjZhMTRi Li4zODU2ZGRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9UYXJnZXQucHJpCisrKyBiL1Nv dXJjZS9XZWJDb3JlL1RhcmdldC5wcmkKQEAgLTYyOSw3ICs2MjksNiBAQCBTT1VSQ0VTICs9IFwK ICAgICBlZGl0aW5nL1JlcGxhY2VTZWxlY3Rpb25Db21tYW5kLmNwcCBcCiAgICAgZWRpdGluZy9T ZXROb2RlQXR0cmlidXRlQ29tbWFuZC5jcHAgXAogICAgIGVkaXRpbmcvU2V0U2VsZWN0aW9uQ29t bWFuZC5jcHAgXAotICAgIGVkaXRpbmcvU21hcnRSZXBsYWNlSUNVLmNwcCBcCiAgICAgZWRpdGlu Zy9TcGVsbENoZWNrZXIuY3BwIFwKICAgICBlZGl0aW5nL1NwZWxsaW5nQ29ycmVjdGlvbkNvbW1h bmQuY3BwIFwKICAgICBlZGl0aW5nL1NwZWxsaW5nQ29ycmVjdGlvbkNvbnRyb2xsZXIuY3BwIFwK QEAgLTI3OTUsNyArMjc5NCw2IEBAIFNPVVJDRVMgKz0gXAogICAgIHBsYXRmb3JtL25ldHdvcmsv cXQvUXRNSU1FVHlwZVNuaWZmZXIuY3BwIFwKICAgICBwbGF0Zm9ybS9uZXR3b3JrL3F0L1FOZXR3 b3JrUmVwbHlIYW5kbGVyLmNwcCBcCiAgICAgZWRpdGluZy9xdC9FZGl0b3JRdC5jcHAgXAotICAg IGVkaXRpbmcvcXQvU21hcnRSZXBsYWNlUXQuY3BwIFwKICAgICBwbGF0Zm9ybS9DdXJzb3IuY3Bw IFwKICAgICBwbGF0Zm9ybS9xdC9DbGlwYm9hcmRRdC5jcHAgXAogICAgIHBsYXRmb3JtL3F0L0Nv bnRleHRNZW51SXRlbVF0LmNwcCBcCkBAIC0yODcwLDEwICsyODY4LDE3IEBAIG1hYyB7CiAgICAg ICAgIHBsYXRmb3JtL3RleHQvY2YvU3RyaW5nSW1wbENGLmNwcAogfQogCi1oYXZlUXQoNSk6Y29u dGFpbnMoUVRfQ09ORklHLGljdSkgewotICAgIFNPVVJDRVMgKz0gcGxhdGZvcm0vdGV4dC9UZXh0 QnJlYWtJdGVyYXRvcklDVS5jcHAKK2hhdmVRdCg1KSB7CisgICAgY29udGFpbnMoUVRfQ09ORklH LGljdSl8bWFjOiBTT1VSQ0VTICs9IHBsYXRmb3JtL3RleHQvVGV4dEJyZWFrSXRlcmF0b3JJQ1Uu Y3BwCisgICAgbWFjIHsKKyAgICAgICAgU09VUkNFUyArPSBlZGl0aW5nL1NtYXJ0UmVwbGFjZUNG LmNwcAorICAgICAgICBJTkNMVURFUEFUSCArPSAkJFBXRC9pY3UKKyAgICB9IGVsc2UgeworICAg ICAgICBTT1VSQ0VTICs9IGVkaXRpbmcvU21hcnRSZXBsYWNlSUNVLmNwcAorICAgIH0KIH0gZWxz ZSB7Ci0gICAgU09VUkNFUyArPSBwbGF0Zm9ybS90ZXh0L3F0L1RleHRCcmVha0l0ZXJhdG9yUXQu Y3BwCisgICAgU09VUkNFUyArPSBwbGF0Zm9ybS90ZXh0L3F0L1RleHRCcmVha0l0ZXJhdG9yUXQu Y3BwIFwKKyAgICAgICAgICAgICAgIGVkaXRpbmcvcXQvU21hcnRSZXBsYWNlUXQuY3BwCiB9CiAK IGNvbnRhaW5zKERFRklORVMsIEVOQUJMRV9ORVRTQ0FQRV9QTFVHSU5fQVBJPTEpIHsKZGlmZiAt LWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzZGZiODlkLi5j Yjk1MDYwIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTQgQEAKKzIwMTItMDEtMjYgIFplbm8gQWxiaXNzZXIgIDx6ZW5vQHdlYmtp dC5vcmc+CisKKyAgICAgICAgW1F0XVtNYWNdIEJ1aWxkIGZhaWxzIGFmdGVyIGFkZGluZyBJQ1Ug c3VwcG9ydCAocjEwNTk5NykuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD03NzExOAorCisgICAgICAgIERlZmluZSBXVEZfVVNFX0lDVV9VTklDT0RFIGlm IHdlIGFyZSBvbiBtYWMuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBxbWFrZS9ta3NwZWNzL2ZlYXR1cmVzL2ZlYXR1cmVzLnByZjoKKwogMjAxMi0w MS0yNiAgSmVzdXMgU2FuY2hlei1QYWxlbmNpYSAgPGplc3VzLnBhbGVuY2lhQG9wZW5ib3NzYS5v cmc+CiAKICAgICAgICAgW1F0XSBVc2UgSUNVIGlmIGF2YWlsYWJsZQpkaWZmIC0tZ2l0IGEvVG9v bHMvcW1ha2UvbWtzcGVjcy9mZWF0dXJlcy9mZWF0dXJlcy5wcmYgYi9Ub29scy9xbWFrZS9ta3Nw ZWNzL2ZlYXR1cmVzL2ZlYXR1cmVzLnByZgppbmRleCBmZTIwZmRiLi44MDYxMDNlIDEwMDY0NAot LS0gYS9Ub29scy9xbWFrZS9ta3NwZWNzL2ZlYXR1cmVzL2ZlYXR1cmVzLnByZgorKysgYi9Ub29s cy9xbWFrZS9ta3NwZWNzL2ZlYXR1cmVzL2ZlYXR1cmVzLnByZgpAQCAtMzAsNyArMzAsNyBAQCBp c0VtcHR5KFNRTElURTNTUkNESVIpIHsKICAgICBTUUxJVEUzU1JDRElSID0gJCRbUVRfSU5TVEFM TF9QUkVGSVhdL3NyYy8zcmRwYXJ0eS9zcWxpdGUvCiB9CiAKLWhhdmVRdCg1KTpjb250YWlucyhR VF9DT05GSUcsaWN1KSB7CitoYXZlUXQoNSk6aWYoY29udGFpbnMoUVRfQ09ORklHLGljdSl8bWFj KSB7CiAgICAgREVGSU5FUyArPSBXVEZfVVNFX0lDVV9VTklDT0RFPTEKICAgICBERUZJTkVTIC09 IFdURl9VU0VfUVQ0X1VOSUNPREUKIH0gZWxzZSB7Cg== 124300 2012-01-27 06:02:03 -0800 2012-01-27 06:06:45 -0800 patch for review. - rebased and fixed indentation. 77118_20120127-150116.patch text/plain 6157 zeno ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IGY2NTg5ZWIuLjAzODhmYWQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTAxLTI2ICBaZW5vIEFsYmlzc2Vy ICA8emVub0B3ZWJraXQub3JnPgorCisgICAgICAgIFtRdF1bTWFjXSBCdWlsZCBmYWlscyBhZnRl ciBhZGRpbmcgSUNVIHN1cHBvcnQgKHIxMDU5OTcpLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzcxMTgKKworICAgICAgICBVc2UgQXBwbGUgY29kZSBw YXRoIGZvciB1bmljb2RlIGRhdGUgZm9ybWF0cyBvbiBtYWMuCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBydW50aW1lL0RhdGVQcm90b3R5cGUuY3Bw OgorICAgICAgICAoKToKKwogMjAxMi0wMS0yNSAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBzaG91bGQgYmUgcG9zc2libGUg dG8gb3BlbiBmdW5jdGlvbiBkZWNsYXJhdGlvbiBmcm9tIHNjcmlwdCBwb3BvdmVyCmRpZmYgLS1n aXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9EYXRlUHJvdG90eXBlLmNwcCBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0RhdGVQcm90b3R5cGUuY3BwCmluZGV4IDVlYjA0 NWIuLjkyMmZiMGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0Rh dGVQcm90b3R5cGUuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0RhdGVQ cm90b3R5cGUuY3BwCkBAIC02MCw3ICs2MCw3IEBACiAjaW5jbHVkZSA8c3lzL3RpbWViLmg+CiAj ZW5kaWYKIAotI2lmIFBMQVRGT1JNKE1BQykgfHwgUExBVEZPUk0oSU9TKSB8fCBQTEFURk9STShX WCkKKyNpZiBQTEFURk9STShNQUMpIHx8IFBMQVRGT1JNKElPUykgfHwgUExBVEZPUk0oV1gpIHx8 IChQTEFURk9STShRVCkgJiYgT1MoREFSV0lOKSkKICNpbmNsdWRlIDxDb3JlRm91bmRhdGlvbi9D b3JlRm91bmRhdGlvbi5oPgogI2VsaWYgVVNFKElDVV9VTklDT0RFKQogI2luY2x1ZGUgPHVuaWNv ZGUvdWRhdC5oPgpAQCAtMTMwLDcgKzEzMCw3IEBAIG5hbWVzcGFjZSBKU0MgewogCiBlbnVtIExv Y2FsZURhdGVUaW1lRm9ybWF0IHsgTG9jYWxlRGF0ZUFuZFRpbWUsIExvY2FsZURhdGUsIExvY2Fs ZVRpbWUgfTsKICAKLSNpZiBQTEFURk9STShNQUMpIHx8IFBMQVRGT1JNKElPUykgfHwgUExBVEZP Uk0oV1gpCisjaWYgUExBVEZPUk0oTUFDKSB8fCBQTEFURk9STShJT1MpIHx8IFBMQVRGT1JNKFdY KSB8fCAoUExBVEZPUk0oUVQpICYmIE9TKERBUldJTikpCiAKIC8vIEZJWE1FOiBTaW5jZSB0aGlz IGlzIHN1cGVyaW9yIHRvIHRoZSBzdHJmdGltZS1iYXNlZCB2ZXJzaW9uLCB3aHkgbGltaXQgdGhp cyB0byBQTEFURk9STShNQUMpPwogLy8gSW5zdGVhZCB3ZSBzaG91bGQgY29uc2lkZXIgdXNpbmcg dGhpcyB3aGVuZXZlciBVU0UoQ0YpIGlzIHRydWUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0No YW5nZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGQ0NGFkZjcuLjg2ZDU0OTIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTQgQEAKKzIwMTItMDEtMjYgIFplbm8gQWxiaXNzZXIgIDx6ZW5vQHdlYmtp dC5vcmc+CisKKyAgICAgICAgW1F0XVtNYWNdIEJ1aWxkIGZhaWxzIGFmdGVyIGFkZGluZyBJQ1Ug c3VwcG9ydCAocjEwNTk5NykuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD03NzExOAorCisgICAgICAgIExpbmsgdG8gbGliaWN1Y29yZSBpZiBwbGF0Zm9y bSBNYWMuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBXVEYucHJpOgorCiAyMDEyLTAxLTI2ICBKZXN1cyBTYW5jaGV6LVBhbGVuY2lhICA8amVzdXMu cGFsZW5jaWFAb3BlbmJvc3NhLm9yZz4KIAogICAgICAgICBbUXRdIFVzZSBJQ1UgaWYgYXZhaWxh YmxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL1dURi5wcmkgYi9Tb3VyY2UvV1RGL1dURi5wcmkK aW5kZXggOTNiYmU5Mi4uMDVkYmE5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dURi9XVEYucHJpCisr KyBiL1NvdXJjZS9XVEYvV1RGLnByaQpAQCAtMTcsMTEgKzE3LDE4IEBAIElOQ0xVREVQQVRIICs9 IFwKICAgICAkJE9MRF9TT1VSQ0VfRElSL3F0IFwKICAgICAkJE9MRF9TT1VSQ0VfRElSL3VuaWNv ZGUKIAotaGF2ZVF0KDUpOmNvbnRhaW5zKFFUX0NPTkZJRyxpY3UpIHsKLSAgICB1bml4OiFtYWM6 IExJQlMgKz0gJCRzeXN0ZW0oaWN1LWNvbmZpZyAtLWxkZmxhZ3Mtc2VhcmNocGF0aCAtLWxkZmxh Z3MtbGlic29ubHkpCi0gICAgZWxzZTogTElCUyArPSAtbGljdWluCi19IGVsc2UgewotICAgIGhh dmVRdCg1KTogZXJyb3IoIlRvIGJ1aWxkIFF0V2ViS2l0IHdpdGggUXQgNSB5b3UgbmVlZCBJQ1Ui KQoraGF2ZVF0KDUpIHsKKyAgICBtYWMgeworICAgICAgICBJTkNMVURFUEFUSCArPSAkJHtST09U X1dFQktJVF9ESVJ9L1NvdXJjZS9XVEYvaWN1CisgICAgICAgIExJQlMgKz0gLWxpY3Vjb3JlCisg ICAgfSBlbHNlIHsKKyAgICAgICAgY29udGFpbnMoUVRfQ09ORklHLGljdSkgeworICAgICAgICAg ICAgdW5peDogTElCUyArPSAkJHN5c3RlbShpY3UtY29uZmlnIC0tbGRmbGFncy1zZWFyY2hwYXRo IC0tbGRmbGFncy1saWJzb25seSkKKyAgICAgICAgICAgIGVsc2U6IExJQlMgKz0gLWxpY3Vpbgor ICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgaGF2ZVF0KDUpOiBlcnJvcigiVG8gYnVpbGQg UXRXZWJLaXQgd2l0aCBRdCA1IHlvdSBuZWVkIElDVSIpCisgICAgICAgIH0KKyAgICB9CiB9CiAK IHY4IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZwppbmRleCAxMTUxMDlmLi4wMDBiMzdiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTQgQEAKKzIwMTItMDEtMjYgIFplbm8gQWxiaXNzZXIgIDx6ZW5vQHdlYmtpdC5vcmc+CisK KyAgICAgICAgW1F0XVtNYWNdIEJ1aWxkIGZhaWxzIGFmdGVyIGFkZGluZyBJQ1Ugc3VwcG9ydCAo cjEwNTk5NykuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD03NzExOAorCisgICAgICAgIFVzZSBTbWFyZVJlcGxhY2VDRi5jcHAgY29kZSBwYXRoIGlmIHBs YXRmb3JtIE1hYy4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFRhcmdldC5wcmk6CisKIDIwMTItMDEtMjcgIE5pa29sYXMgWmltbWVybWFubiAgPG56 aW1tZXJtYW5uQHJpbS5jb20+CiAKICAgICAgICAgPGZlSW1hZ2U+IGRvZXNuJ3Qgd29yayB3aXRo IGxvY2FsIHJlZmVyZW5jZXMgd2hlbiB1c2luZyBwcmltaXRpdmVVbml0cz0ib2JqZWN0Qm91bmRp bmdCb3giCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9UYXJnZXQucHJpIGIvU291cmNlL1dl YkNvcmUvVGFyZ2V0LnByaQppbmRleCA2YjZhMTRiLi4zODU2ZGRjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9UYXJnZXQucHJpCisrKyBiL1NvdXJjZS9XZWJDb3JlL1RhcmdldC5wcmkKQEAg LTYyOSw3ICs2MjksNiBAQCBTT1VSQ0VTICs9IFwKICAgICBlZGl0aW5nL1JlcGxhY2VTZWxlY3Rp b25Db21tYW5kLmNwcCBcCiAgICAgZWRpdGluZy9TZXROb2RlQXR0cmlidXRlQ29tbWFuZC5jcHAg XAogICAgIGVkaXRpbmcvU2V0U2VsZWN0aW9uQ29tbWFuZC5jcHAgXAotICAgIGVkaXRpbmcvU21h cnRSZXBsYWNlSUNVLmNwcCBcCiAgICAgZWRpdGluZy9TcGVsbENoZWNrZXIuY3BwIFwKICAgICBl ZGl0aW5nL1NwZWxsaW5nQ29ycmVjdGlvbkNvbW1hbmQuY3BwIFwKICAgICBlZGl0aW5nL1NwZWxs aW5nQ29ycmVjdGlvbkNvbnRyb2xsZXIuY3BwIFwKQEAgLTI3OTUsNyArMjc5NCw2IEBAIFNPVVJD RVMgKz0gXAogICAgIHBsYXRmb3JtL25ldHdvcmsvcXQvUXRNSU1FVHlwZVNuaWZmZXIuY3BwIFwK ICAgICBwbGF0Zm9ybS9uZXR3b3JrL3F0L1FOZXR3b3JrUmVwbHlIYW5kbGVyLmNwcCBcCiAgICAg ZWRpdGluZy9xdC9FZGl0b3JRdC5jcHAgXAotICAgIGVkaXRpbmcvcXQvU21hcnRSZXBsYWNlUXQu Y3BwIFwKICAgICBwbGF0Zm9ybS9DdXJzb3IuY3BwIFwKICAgICBwbGF0Zm9ybS9xdC9DbGlwYm9h cmRRdC5jcHAgXAogICAgIHBsYXRmb3JtL3F0L0NvbnRleHRNZW51SXRlbVF0LmNwcCBcCkBAIC0y ODcwLDEwICsyODY4LDE3IEBAIG1hYyB7CiAgICAgICAgIHBsYXRmb3JtL3RleHQvY2YvU3RyaW5n SW1wbENGLmNwcAogfQogCi1oYXZlUXQoNSk6Y29udGFpbnMoUVRfQ09ORklHLGljdSkgewotICAg IFNPVVJDRVMgKz0gcGxhdGZvcm0vdGV4dC9UZXh0QnJlYWtJdGVyYXRvcklDVS5jcHAKK2hhdmVR dCg1KSB7CisgICAgY29udGFpbnMoUVRfQ09ORklHLGljdSl8bWFjOiBTT1VSQ0VTICs9IHBsYXRm b3JtL3RleHQvVGV4dEJyZWFrSXRlcmF0b3JJQ1UuY3BwCisgICAgbWFjIHsKKyAgICAgICAgU09V UkNFUyArPSBlZGl0aW5nL1NtYXJ0UmVwbGFjZUNGLmNwcAorICAgICAgICBJTkNMVURFUEFUSCAr PSAkJFBXRC9pY3UKKyAgICB9IGVsc2UgeworICAgICAgICBTT1VSQ0VTICs9IGVkaXRpbmcvU21h cnRSZXBsYWNlSUNVLmNwcAorICAgIH0KIH0gZWxzZSB7Ci0gICAgU09VUkNFUyArPSBwbGF0Zm9y bS90ZXh0L3F0L1RleHRCcmVha0l0ZXJhdG9yUXQuY3BwCisgICAgU09VUkNFUyArPSBwbGF0Zm9y bS90ZXh0L3F0L1RleHRCcmVha0l0ZXJhdG9yUXQuY3BwIFwKKyAgICAgICAgICAgICAgIGVkaXRp bmcvcXQvU21hcnRSZXBsYWNlUXQuY3BwCiB9CiAKIGNvbnRhaW5zKERFRklORVMsIEVOQUJMRV9O RVRTQ0FQRV9QTFVHSU5fQVBJPTEpIHsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rv b2xzL0NoYW5nZUxvZwppbmRleCBkYzhkMjE5Li5lNjA5OTIzIDEwMDY0NAotLS0gYS9Ub29scy9D aGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTItMDEt MjYgIFplbm8gQWxiaXNzZXIgIDx6ZW5vQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW1F0XVtNYWNd IEJ1aWxkIGZhaWxzIGFmdGVyIGFkZGluZyBJQ1Ugc3VwcG9ydCAocjEwNTk5NykuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NzExOAorCisgICAgICAg IERlZmluZSBXVEZfVVNFX0lDVV9VTklDT0RFIGlmIHdlIGFyZSBvbiBtYWMuCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBxbWFrZS9ta3NwZWNzL2Zl YXR1cmVzL2ZlYXR1cmVzLnByZjoKKwogMjAxMi0wMS0yNyAgVnNldm9sb2QgVmxhc292ICA8dnNl dmlrQGNocm9taXVtLm9yZz4KIAogICAgICAgICBBZGQgVnNldm9sb2QgVmxhc292IHRvIHJldmll d2VycyBsaXN0LgpkaWZmIC0tZ2l0IGEvVG9vbHMvcW1ha2UvbWtzcGVjcy9mZWF0dXJlcy9mZWF0 dXJlcy5wcmYgYi9Ub29scy9xbWFrZS9ta3NwZWNzL2ZlYXR1cmVzL2ZlYXR1cmVzLnByZgppbmRl eCBmZTIwZmRiLi44MDYxMDNlIDEwMDY0NAotLS0gYS9Ub29scy9xbWFrZS9ta3NwZWNzL2ZlYXR1 cmVzL2ZlYXR1cmVzLnByZgorKysgYi9Ub29scy9xbWFrZS9ta3NwZWNzL2ZlYXR1cmVzL2ZlYXR1 cmVzLnByZgpAQCAtMzAsNyArMzAsNyBAQCBpc0VtcHR5KFNRTElURTNTUkNESVIpIHsKICAgICBT UUxJVEUzU1JDRElSID0gJCRbUVRfSU5TVEFMTF9QUkVGSVhdL3NyYy8zcmRwYXJ0eS9zcWxpdGUv CiB9CiAKLWhhdmVRdCg1KTpjb250YWlucyhRVF9DT05GSUcsaWN1KSB7CitoYXZlUXQoNSk6aWYo Y29udGFpbnMoUVRfQ09ORklHLGljdSl8bWFjKSB7CiAgICAgREVGSU5FUyArPSBXVEZfVVNFX0lD VV9VTklDT0RFPTEKICAgICBERUZJTkVTIC09IFdURl9VU0VfUVQ0X1VOSUNPREUKIH0gZWxzZSB7 Cg==