51327 2010-12-20 04:28:13 -0800 [GTK] minimal build fails at link time due to missing sqlite3 symbols 2011-01-11 03:40:09 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 pnormand webkit-unassigned msmith xan.lopez oldest_to_newest 324332 0 pnormand 2010-12-20 04:28:13 -0800 WebCore/platform/sql/SQL* files should be included in the build only if the DATABASE feature is enabled. Especially SQLiteDatabase.cpp which is not guarded by that macro and includes sqlite3.h. At configure time sqlite3 presence is checked only if one of the database-related features is enabled. 324338 1 76989 pnormand 2010-12-20 05:17:14 -0800 Created attachment 76989 proposed patch 324966 2 76989 xan.lopez 2010-12-21 05:41:38 -0800 Comment on attachment 76989 proposed patch Any reason not to make the files have the proper guards? 324980 3 pnormand 2010-12-21 06:21:03 -0800 (In reply to comment #2) > (From update of attachment 76989 [details]) > Any reason not to make the files have the proper guards? Well SQLiteDatabase is used in WebCore/page/GeolocationPositionCache.cpp, the appcache code, the icon database, WebCore/storage and probably more than git grep tells me. Now I think of another approach, what about keeping the GNUMakefile.am as it is and in configure.ac always check for sqlite3 presence. If it's not found and one or more features needing it are enabled, error out. If it's found and no features require it, platform/sql/SQL* will built anyway and not fail because the CFLAGS and LDFLAGS will be ok. That'd be a less intrusive way to solve the problem, I believe. 325016 4 76989 pnormand 2010-12-21 08:24:04 -0800 Comment on attachment 76989 proposed patch Will rework this 327537 5 77611 pnormand 2010-12-29 04:54:35 -0800 Created attachment 77611 proposed patch 327703 6 77611 mrobinson 2010-12-29 14:26:32 -0800 Comment on attachment 77611 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=77611&action=review Thanks! Please fix some of these really minor issues before landing this. > configure.ac:844 > +# check if sqlite 3 is available. Error out only if one of the Please fix the capitalization here before landing. :) > configure.ac:863 > + AC_MSG_ERROR([SQLite3 is required to enable Database support]) For instance, if the error was due to missing SQLite and the feature was offline web applications, this message would be incorrect. Do you mind making it more general (or more specific with if-else blocks) before landing? 327865 7 pnormand 2010-12-30 02:18:28 -0800 Thanks Martin, I made the error message more general. Committed r74792: <http://trac.webkit.org/changeset/74792> 332247 8 pnormand 2011-01-11 03:40:09 -0800 *** Bug 49208 has been marked as a duplicate of this bug. *** 76989 2010-12-20 05:17:14 -0800 2010-12-29 04:54:35 -0800 proposed patch proposed-patch.patch text/plain 2671 pnormand RnJvbSA0M2IwNzhmOWQ1MTY2OTY0YmM2ZTVhNzE2OTk2YjVmYjE3OWQ5NzRlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBNb24sIDIwIERlYyAyMDEwIDE0OjE2OjI0ICswMTAwClN1YmplY3Q6IFtQQVRDSF0g cHJvcG9zZWQgcGF0Y2gKCi0tLQogV2ViQ29yZS9DaGFuZ2VMb2cgICAgICB8ICAgMTQgKysrKysr KysrKysrKysKIFdlYkNvcmUvR05VbWFrZWZpbGUuYW0gfCAgIDIzICsrKysrKysrKysrKy0tLS0t LS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDI2IGluc2VydGlvbnMoKyksIDExIGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5k ZXggYzE4ZmU5MC4uYjlmYjIxZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIv V2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0xMi0yMCAgUGhpbGlwcGUg Tm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gbWluaW1hbCBidWlsZCBmYWlscyBhdCBsaW5r IHRpbWUgZHVlIHRvIG1pc3Npbmcgc3FsaXRlMyBzeW1ib2xzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MTMyNworCisgICAgICAgIEluY2x1ZGUgcGxh dGZvcm0vc3FsL1NRTCogZmlsZXMgaW4gdGhlIGJ1aWxkIG9ubHkgaWYgdGhlIERBVEFCQVNFCisg ICAgICAgIGZlYXR1cmUgaXMgZW5hYmxlZC4KKworICAgICAgICBObyBuZXcgdGVzdHMsIGJ1aWxk IGZpeCBvbmx5LgorCisgICAgICAgICogR05VbWFrZWZpbGUuYW06CisKIDIwMTAtMTItMjAgIFl1 cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgUGF2ZWwgRmVsZG1hbi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvR05VbWFrZWZpbGUuYW0gYi9X ZWJDb3JlL0dOVW1ha2VmaWxlLmFtCmluZGV4IGNiMzZlMzEuLjc4OGNhOTAgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvR05VbWFrZWZpbGUuYW0KKysrIGIvV2ViQ29yZS9HTlVtYWtlZmlsZS5hbQpAQCAt MjU4NywxNyArMjU4Nyw2IEBAIHdlYmNvcmVfc291cmNlcyArPSBcCiAJV2ViQ29yZS9wbGF0Zm9y bS9TaGFyZWRCdWZmZXIuaCBcCiAJV2ViQ29yZS9wbGF0Zm9ybS9TaGFyZWRUaW1lci5oIFwKIAlX ZWJDb3JlL3BsYXRmb3JtL1NvdW5kLmggXAotCVdlYkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0ZUF1 dGhvcml6ZXIuY3BwIFwKLQlXZWJDb3JlL3BsYXRmb3JtL3NxbC9TUUxpdGVEYXRhYmFzZS5jcHAg XAotCVdlYkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0ZURhdGFiYXNlLmggXAotCVdlYkNvcmUvcGxh dGZvcm0vc3FsL1NRTGl0ZUZpbGVTeXN0ZW0uY3BwIFwKLQlXZWJDb3JlL3BsYXRmb3JtL3NxbC9T UUxpdGVGaWxlU3lzdGVtLmggXAotCVdlYkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0ZVN0YXRlbWVu dC5jcHAgXAotCVdlYkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0ZVN0YXRlbWVudC5oIFwKLQlXZWJD b3JlL3BsYXRmb3JtL3NxbC9TUUxpdGVUcmFuc2FjdGlvbi5jcHAgXAotCVdlYkNvcmUvcGxhdGZv cm0vc3FsL1NRTGl0ZVRyYW5zYWN0aW9uLmggXAotCVdlYkNvcmUvcGxhdGZvcm0vc3FsL1NRTFZh bHVlLmNwcCBcCi0JV2ViQ29yZS9wbGF0Zm9ybS9zcWwvU1FMVmFsdWUuaCBcCiAJV2ViQ29yZS9w bGF0Zm9ybS9TU0xLZXlHZW5lcmF0b3IuaCBcCiAJV2ViQ29yZS9wbGF0Zm9ybS9TdWRkZW5UZXJt aW5hdGlvbi5oIFwKIAlXZWJDb3JlL3BsYXRmb3JtL1N5c3RlbVRpbWUuaCBcCkBAIC0zOTUwLDYg KzM5MzksMTggQEAgd2ViY29yZV9idWlsdF9zb3VyY2VzICs9IFwKIAlEZXJpdmVkU291cmNlcy9X ZWJDb3JlL0pTU1FMVHJhbnNhY3Rpb25TeW5jLmNwcCBcCiAJRGVyaXZlZFNvdXJjZXMvV2ViQ29y ZS9KU1NRTFRyYW5zYWN0aW9uU3luY0NhbGxiYWNrLmNwcCBcCiAJRGVyaXZlZFNvdXJjZXMvV2Vi Q29yZS9KU1NRTFRyYW5zYWN0aW9uU3luY0NhbGxiYWNrLmgKK3dlYmNvcmVfc291cmNlcyArPSBc CisJV2ViQ29yZS9wbGF0Zm9ybS9zcWwvU1FMaXRlQXV0aG9yaXplci5jcHAgXAorCVdlYkNvcmUv cGxhdGZvcm0vc3FsL1NRTGl0ZURhdGFiYXNlLmNwcCBcCisJV2ViQ29yZS9wbGF0Zm9ybS9zcWwv U1FMaXRlRGF0YWJhc2UuaCBcCisJV2ViQ29yZS9wbGF0Zm9ybS9zcWwvU1FMaXRlRmlsZVN5c3Rl bS5jcHAgXAorCVdlYkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0ZUZpbGVTeXN0ZW0uaCBcCisJV2Vi Q29yZS9wbGF0Zm9ybS9zcWwvU1FMaXRlU3RhdGVtZW50LmNwcCBcCisJV2ViQ29yZS9wbGF0Zm9y bS9zcWwvU1FMaXRlU3RhdGVtZW50LmggXAorCVdlYkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0ZVRy YW5zYWN0aW9uLmNwcCBcCisJV2ViQ29yZS9wbGF0Zm9ybS9zcWwvU1FMaXRlVHJhbnNhY3Rpb24u aCBcCisJV2ViQ29yZS9wbGF0Zm9ybS9zcWwvU1FMVmFsdWUuY3BwIFwKKwlXZWJDb3JlL3BsYXRm b3JtL3NxbC9TUUxWYWx1ZS5oCiBlbHNlCiB3ZWJjb3JlX2NwcGZsYWdzICs9IC1ERU5BQkxFX0RB VEFCQVNFPTAKIGVuZGlmICMgRU5EIEVOQUJMRV9EQVRBQkFTRQotLSAKMS43LjIuMw== 77611 2010-12-29 04:54:35 -0800 2010-12-29 14:26:32 -0800 proposed patch proposed-patch.patch text/plain 6738 pnormand RnJvbSAzNTE2YTE1NmMzNTg2OWEwZTRkZjZhMTdiYzgwY2E4NGFiNmQwYmI0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBUdWUsIDIxIERlYyAyMDEwIDE3OjEwOjM4ICswMTAwClN1YmplY3Q6IFtQQVRDSF0g cHJvcG9zZWQgcGF0Y2gKCi0tLQogQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHwgICAxMCArKysrKysrKwogV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAg ICAgICAgICAgIHwgICAxNyArKysrKysrKysrKysrKwogV2ViQ29yZS9wbGF0Zm9ybS9zcWwvU1FM aXRlQXV0aG9yaXplci5jcHAgIHwgICAgNCArKysKIFdlYkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0 ZURhdGFiYXNlLmNwcCAgICB8ICAgIDMgKysKIFdlYkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0ZUZp bGVTeXN0ZW0uY3BwICB8ICAgIDMgKysKIFdlYkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0ZVN0YXRl bWVudC5jcHAgICB8ICAgIDQgKysrCiBXZWJDb3JlL3BsYXRmb3JtL3NxbC9TUUxpdGVUcmFuc2Fj dGlvbi5jcHAgfCAgICAzICsrCiBjb25maWd1cmUuYWMgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgfCAgIDMyICsrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLQogOCBmaWxlcyBjaGFuZ2Vk LCA2MiBpbnNlcnRpb25zKCspLCAxNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9DaGFuZ2VM b2cgYi9DaGFuZ2VMb2cKaW5kZXggMDY2OGI5Yy4uYjExYzkxMiAxMDA2NDQKLS0tIGEvQ2hhbmdl TG9nCisrKyBiL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEwLTEyLTI5ICBQaGlsaXBw ZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbR1RLXSBtaW5pbWFsIGJ1aWxkIGZhaWxzIGF0IGxp bmsgdGltZSBkdWUgdG8gbWlzc2luZyBzcWxpdGUzIHN5bWJvbHMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUxMzI3CisKKyAgICAgICAgKiBjb25maWd1 cmUuYWM6IEVycm9yIG91dCBpZiBTUUxpdGUzIHdhc24ndCBmb3VuZCB3aGlsZSBhdCBsZWFzdAor ICAgICAgICBvbmUgb2YgdGhlIGZlYXR1cmVzIGRlcGVuZGluZyBvbiBpdCBoYXMgYmVlbiBlbmFi bGVkLgorCiAyMDEwLTEyLTI3ICBSeXVhbiBDaG9pICA8cnl1YW4uY2hvaUBzYW1zdW5nLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBEYXZpZCBMZXZpbi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUv Q2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjBjMzQxZi4uNjcxYWRhZiAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMCBAQAorMjAxMC0xMi0yOSAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxp YS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg W0dUS10gbWluaW1hbCBidWlsZCBmYWlscyBhdCBsaW5rIHRpbWUgZHVlIHRvIG1pc3Npbmcgc3Fs aXRlMyBzeW1ib2xzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD01MTMyNworCisgICAgICAgIEd1YXJkIHRoZSBjb2RlIGNhbGxpbmcgc3FsaXRlMyB3aXRo IHRoZSBFTkFCTEUoREFUQUJBU0UpIGNoZWNrLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgYnVp bGQgZml4IG9ubHkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9zcWwvU1FMaXRlQXV0aG9yaXplci5j cHA6CisgICAgICAgICogcGxhdGZvcm0vc3FsL1NRTGl0ZURhdGFiYXNlLmNwcDoKKyAgICAgICAg KiBwbGF0Zm9ybS9zcWwvU1FMaXRlRmlsZVN5c3RlbS5jcHA6CisgICAgICAgICogcGxhdGZvcm0v c3FsL1NRTGl0ZVN0YXRlbWVudC5jcHA6CisgICAgICAgICogcGxhdGZvcm0vc3FsL1NRTGl0ZVRy YW5zYWN0aW9uLmNwcDoKKwogMjAxMC0xMi0yOCAgUHJhdGlrIFNvbGFua2kgIDxwc29sYW5raUBh cHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCmRpZmYgLS1naXQg YS9XZWJDb3JlL3BsYXRmb3JtL3NxbC9TUUxpdGVBdXRob3JpemVyLmNwcCBiL1dlYkNvcmUvcGxh dGZvcm0vc3FsL1NRTGl0ZUF1dGhvcml6ZXIuY3BwCmluZGV4IGY5ZGEyNjAuLjZmYmY3OWQgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0ZUF1dGhvcml6ZXIuY3BwCisrKyBi L1dlYkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0ZUF1dGhvcml6ZXIuY3BwCkBAIC0yNSw5ICsyNSwx MSBAQAogICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBB TlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GCiAgKiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklT RUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICovCisKICNpbmNsdWRlICJj b25maWcuaCIKICNpbmNsdWRlICJEYXRhYmFzZUF1dGhvcml6ZXIuaCIKIAorI2lmIEVOQUJMRShE QVRBQkFTRSkKICNpbmNsdWRlIDxzcWxpdGUzLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAg LTM3LDMgKzM5LDUgQEAgY29uc3QgaW50IFNRTEF1dGhJZ25vcmUgPSBTUUxJVEVfSUdOT1JFOwog Y29uc3QgaW50IFNRTEF1dGhEZW55ID0gU1FMSVRFX0RFTlk7CiAKIH0gLy8gbmFtZXNwYWNlIFdl YkNvcmUKKworI2VuZGlmIC8vIEVOQUJMRShEQVRBQkFTRSkKZGlmZiAtLWdpdCBhL1dlYkNvcmUv cGxhdGZvcm0vc3FsL1NRTGl0ZURhdGFiYXNlLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vc3FsL1NR TGl0ZURhdGFiYXNlLmNwcAppbmRleCBmYjI1ODg5Li41YmI1NmFiIDEwMDY0NAotLS0gYS9XZWJD b3JlL3BsYXRmb3JtL3NxbC9TUUxpdGVEYXRhYmFzZS5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9y bS9zcWwvU1FMaXRlRGF0YWJhc2UuY3BwCkBAIC0yNyw2ICsyNyw3IEBACiAjaW5jbHVkZSAiY29u ZmlnLmgiCiAjaW5jbHVkZSAiU1FMaXRlRGF0YWJhc2UuaCIKIAorI2lmIEVOQUJMRShEQVRBQkFT RSkKICNpbmNsdWRlICJEYXRhYmFzZUF1dGhvcml6ZXIuaCIKICNpbmNsdWRlICJMb2dnaW5nLmgi CiAjaW5jbHVkZSAiU1FMaXRlRmlsZVN5c3RlbS5oIgpAQCAtNDcxLDMgKzQ3Miw1IEBAIGJvb2wg U1FMaXRlRGF0YWJhc2U6OnR1cm5PbkluY3JlbWVudGFsQXV0b1ZhY3V1bSgpCiB9CiAKIH0gLy8g bmFtZXNwYWNlIFdlYkNvcmUKKworI2VuZGlmIC8vIEVOQUJMRShEQVRBQkFTRSkKZGlmZiAtLWdp dCBhL1dlYkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0ZUZpbGVTeXN0ZW0uY3BwIGIvV2ViQ29yZS9w bGF0Zm9ybS9zcWwvU1FMaXRlRmlsZVN5c3RlbS5jcHAKaW5kZXggZDQ4N2I5NS4uMzYyMDA1YyAx MDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9zcWwvU1FMaXRlRmlsZVN5c3RlbS5jcHAKKysr IGIvV2ViQ29yZS9wbGF0Zm9ybS9zcWwvU1FMaXRlRmlsZVN5c3RlbS5jcHAKQEAgLTMyLDYgKzMy LDggQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJTUUxpdGVGaWxlU3lzdGVtLmgi CiAKKyNpZiBFTkFCTEUoREFUQUJBU0UpCisKICNpbmNsdWRlICJGaWxlU3lzdGVtLmgiCiAjaW5j bHVkZSAiU1FMaXRlRGF0YWJhc2UuaCIKICNpbmNsdWRlICJTUUxpdGVTdGF0ZW1lbnQuaCIKQEAg LTEyMywzICsxMjUsNCBAQCBsb25nIGxvbmcgU1FMaXRlRmlsZVN5c3RlbTo6Z2V0RGF0YWJhc2VG aWxlU2l6ZShjb25zdCBTdHJpbmcmIGZpbGVOYW1lKQogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJD b3JlCisjZW5kaWYgLy8gRU5BQkxFKERBVEFCQVNFKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0 Zm9ybS9zcWwvU1FMaXRlU3RhdGVtZW50LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0 ZVN0YXRlbWVudC5jcHAKaW5kZXggMDM3ZWM3OS4uYWY5NTE4YSAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9wbGF0Zm9ybS9zcWwvU1FMaXRlU3RhdGVtZW50LmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3Jt L3NxbC9TUUxpdGVTdGF0ZW1lbnQuY3BwCkBAIC0yNiw2ICsyNiw4IEBACiAjaW5jbHVkZSAiY29u ZmlnLmgiCiAjaW5jbHVkZSAiU1FMaXRlU3RhdGVtZW50LmgiCiAKKyNpZiBFTkFCTEUoREFUQUJB U0UpCisKICNpbmNsdWRlICJMb2dnaW5nLmgiCiAjaW5jbHVkZSAiU1FMVmFsdWUuaCIKICNpbmNs dWRlIDxzcWxpdGUzLmg+CkBAIC00OTYsMyArNDk4LDUgQEAgYm9vbCBTUUxpdGVTdGF0ZW1lbnQ6 OmlzRXhwaXJlZCgpCiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKKworI2VuZGlmIC8vIEVO QUJMRShEQVRBQkFTRSkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0ZVRy YW5zYWN0aW9uLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0ZVRyYW5zYWN0aW9uLmNw cAppbmRleCA2ZjkwZWFjLi42M2IzZTdhIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL3Nx bC9TUUxpdGVUcmFuc2FjdGlvbi5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9zcWwvU1FMaXRl VHJhbnNhY3Rpb24uY3BwCkBAIC0yNiw2ICsyNiw4IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAj aW5jbHVkZSAiU1FMaXRlVHJhbnNhY3Rpb24uaCIKIAorI2lmIEVOQUJMRShEQVRBQkFTRSkKKwog I2luY2x1ZGUgIlNRTGl0ZURhdGFiYXNlLmgiCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTEw MSwzICsxMDMsNCBAQCBib29sIFNRTGl0ZVRyYW5zYWN0aW9uOjp3YXNSb2xsZWRCYWNrQnlTcWxp dGUoKSBjb25zdAogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCisjZW5kaWYgLy8gRU5BQkxF KERBVEFCQVNFKQpkaWZmIC0tZ2l0IGEvY29uZmlndXJlLmFjIGIvY29uZmlndXJlLmFjCmluZGV4 IDk3MjRhZGMuLjNmOGM2YjAgMTAwNjQ0Ci0tLSBhL2NvbmZpZ3VyZS5hYworKysgYi9jb25maWd1 cmUuYWMKQEAgLTg0MSwyMiArODQxLDI2IEBAIGlmIHRlc3QgIiR3aXRoX2ZvbnRfYmFja2VuZCIg PSAiZnJlZXR5cGUiOyB0aGVuCiAgICBBQ19TVUJTVChbRlJFRVRZUEVfTElCU10pCiBmaQogCi0j IGNoZWNrIGlmIHNxbGl0ZSAzIGlzIGF2YWlsYWJsZQotaWYgdGVzdCAiJGVuYWJsZV9pY29uX2Rh dGFiYXNlIiA9ICJ5ZXMiIHx8IFwKKyMgY2hlY2sgaWYgc3FsaXRlIDMgaXMgYXZhaWxhYmxlLiBF cnJvciBvdXQgb25seSBpZiBvbmUgb2YgdGhlCisjIGZlYXR1cmVzIGhhcmQtZGVwZW5kaW5nIG9u IGl0IGlzIGVuYWJsZWQgd2hpbGUgU1FMaXRlMyBpcworIyB1bmF2YWlsYWJsZS4KK1BLR19DSEVD S19NT0RVTEVTKFtTUUxJVEUzXSwKKyAgICAgICAgICAgICAgICAgIFtzcWxpdGUzID49ICRTUUxJ VEVfUkVRVUlSRURfVkVSU0lPTl0sCisgICAgICAgICAgICAgICAgICBbc3FsaXRlM19oYXNfcGtn X2NvbmZpZz15ZXNdLAorICAgICAgICAgICAgICAgICAgW3NxbGl0ZTNfaGFzX3BrZ19jb25maWc9 bm9dKQoraWYgdGVzdCAiJHNxbGl0ZTNfaGFzX3BrZ19jb25maWciID0gIm5vIjsgdGhlbgorICAg QUNfU0VBUkNIX0xJQlMoW3NxbGl0ZTNfb3BlbjE2XSwgW3NxbGl0ZTNdLAorICAgICAgICAgICAg ICAgICAgW3NxbGl0ZTNfZm91bmQ9eWVzO1NRTElURTNfTElCUz0iJExJQlMiO1NRTElURTNfQ0ZM QUdTPSItSSAkc3JjZGlyL1dlYktpdExpYnJhcmllcy9XZWJDb3JlU1FMaXRlMyJdLAorICAgICAg ICAgICAgICAgICAgW3NxbGl0ZTNfZm91bmQ9bm9dKQorZmkKK0FDX1NVQlNUKFtTUUxJVEUzX0NG TEFHU10pCitBQ19TVUJTVChbU1FMSVRFM19MSUJTXSkKKworaWYgKHRlc3QgIiRzcWxpdGUzX2Zv dW5kIiA9ICJubyIpICYmICh0ZXN0ICIkZW5hYmxlX2ljb25fZGF0YWJhc2UiID0gInllcyIgfHwg XAogICAgdGVzdCAiJGVuYWJsZV9kYXRhYmFzZSIgPSAieWVzIiB8fCBcCiAgICB0ZXN0ICIkZW5h YmxlX29mZmxpbmVfd2ViX2FwcGxpY2F0aW9ucyIgPSAieWVzIiB8fCBcCi0gICB0ZXN0ICIkZW5h YmxlX2RvbV9zdG9yYWdlIiA9ICJ5ZXMiOyB0aGVuCi0gICBQS0dfQ0hFQ0tfTU9EVUxFUyhbU1FM SVRFM10sCi0gICAgICAgICAgICAgICAgICAgICBbc3FsaXRlMyA+PSAkU1FMSVRFX1JFUVVJUkVE X1ZFUlNJT05dLAotICAgICAgICAgICAgICAgICAgICAgW3NxbGl0ZTNfaGFzX3BrZ19jb25maWc9 eWVzXSwKLSAgICAgICAgICAgICAgICAgICAgIFtzcWxpdGUzX2hhc19wa2dfY29uZmlnPW5vXSkK LSAgIGlmIHRlc3QgIiRzcWxpdGUzX2hhc19wa2dfY29uZmlnIiA9ICJubyI7IHRoZW4KLSAgICAg IEFDX1NFQVJDSF9MSUJTKFtzcWxpdGUzX29wZW4xNl0sIFtzcWxpdGUzXSwKLSAgICAgICAgICAg ICAgICAgICAgIFtTUUxJVEUzX0xJQlM9IiRMSUJTIjtTUUxJVEUzX0NGTEFHUz0iLUkgJHNyY2Rp ci9XZWJLaXRMaWJyYXJpZXMvV2ViQ29yZVNRTGl0ZTMiXSwKLSAgICAgICAgICAgICAgICAgICAg IFtBQ19NU0dfRVJST1IoW1NRTGl0ZTMgaXMgcmVxdWlyZWQgdG8gZW5hYmxlIERhdGFiYXNlIHN1 cHBvcnRdKV0pCi0gICBmaQotICAgQUNfU1VCU1QoW1NRTElURTNfQ0ZMQUdTXSkKLSAgIEFDX1NV QlNUKFtTUUxJVEUzX0xJQlNdKQorICAgdGVzdCAiJGVuYWJsZV9kb21fc3RvcmFnZSIgPSAieWVz Iik7IHRoZW4KKyAgIEFDX01TR19FUlJPUihbU1FMaXRlMyBpcyByZXF1aXJlZCB0byBlbmFibGUg RGF0YWJhc2Ugc3VwcG9ydF0pCiBmaQogCiAjIGNoZWNrIGlmIGxpYnhzbHQgaXMgYXZhaWxhYmxl Ci0tIAoxLjcuMi4z