commit: 259d8bab051acba85157426d1df7c03d0c9d97bf Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> AuthorDate: Wed Mar 2 03:34:16 2016 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Thu Mar 3 01:50:01 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=259d8bab
dev-db/sqlite: Version bump (3.11.0). Link executables against libsqlite3.so instead of statically including code from sqlite3.c. Backport SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER from 3.12.0. dev-db/sqlite/Manifest | 3 + ...all-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch | 443 +++++++++++++++++++++ .../files/sqlite-3.11.0-full_tarball-build.patch | 132 ++++++ ...all-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch | 232 +++++++++++ .../sqlite-3.11.0-nonfull_tarball-build.patch | 38 ++ dev-db/sqlite/sqlite-3.11.0.ebuild | 243 +++++++++++ 6 files changed, 1091 insertions(+) diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest index c1e7536..3940f57 100644 --- a/dev-db/sqlite/Manifest +++ b/dev-db/sqlite/Manifest @@ -5,6 +5,7 @@ DIST sqlite-autoconf-3090100.tar.gz 2284128 SHA256 d89d0e1d93deafebd0aa067d20d90 DIST sqlite-autoconf-3090200.tar.gz 2284431 SHA256 064c0abe9c9177534d4c770bca7a5902f9924b629ac886b4c08956be6dfbc36b SHA512 c4fdd7dee58e2e4c83091f2a98d8099c6403a66f566be46b54d465c5a58404555fdc1d08050ca60edb6366d220407cfc7409921c123915f78a04cd9930217fa7 WHIRLPOOL c57c3a3f9a7186606a8de0f562490d6c1db27204e9799f39313ea139fabb64bfc918243a20173119bc73776dbd42fc4c316590eb3a4c4334ef669a93be819adf DIST sqlite-autoconf-3100000.tar.gz 2331542 SHA256 43cc292d70711fa7580250c8a1cd7c64813a4a0a479dbd502cce5f10b5d91042 SHA512 0d34f511f386e841b60ca6354715e7196c2c3d47e0ae13f09b9ae8d0f95118104b2bd8e13697c4c97b994269c2b2e112841ab74e82a2a64c50243d8ec8d8f46e WHIRLPOOL 090ee131929573a71f3049ee9accf3e8df21dd9d6834e499baf0988cad6bd64f433ef5f05cdb0ba0a15254ced47d94591c913be5e15d0de76e4a41f391393d94 DIST sqlite-autoconf-3100200.tar.gz 2332013 SHA256 a2b3b4bd1291ea7d6c8252f7edff36a4362f2f0e5d5370444ba6cbe313ae2971 SHA512 fa4e3757d76c9f0cf167481346c0844f41a3a7ea0e8fde186be7ebcc14f9b45b770386110e23860c6dcaaf1819aa12725fde7507271a0a8b59610dcc458c552f WHIRLPOOL 5bc1f324bb9fb7baa70a12e6e1519ccae7f2beef51ec48312df4a1a8890406bfbd4a9c0ee0b5a186619624763c65238fa34b88bb478c76e7a39b23c4a96eb66a +DIST sqlite-autoconf-3110000.tar.gz 2359347 SHA256 508d4dcbcf7a7181e95c717a1dc4ae3c0880b3d593be0c4b40abb6c3a0e201fb SHA512 208bb41e9b2a67ba5efdefe5393161996b7741a153647bd28b680a41a7d3c23f6c916bf6eede5325f507697fa92571c4982522ba9396a58e7a675564dec73865 WHIRLPOOL 9096de033729f27ccbdea0753b27a5170b1c1d7c6b016d00ad27c1a4b29dc8eabf15a1b8afcf97682f33b064552db3ceac5eb9d9612c8fd17d3602d3a592eb3d DIST sqlite-doc-3081001.zip 5060040 SHA256 0b6c186a2da8b7d7397eb3942e97fd85b88734beb300702ace0dca4a3db729a6 SHA512 76caf476c98d8a0f5da55c4608bfc31235289e3ab2286089195fab86da6b5d98b2d5eb0fe7b81e3aff8f04939c9bcbfded6be22f0eeb21103478bf519e9ff78b WHIRLPOOL 5edd1d06babf19d54e326f6262d45851d43a0907adad66b130c93cf63efbfadcad6dbc98330bd4d2f80d1d528cd9088ada0727475b42005de6bcdbc4914e5d7c DIST sqlite-doc-3081002.zip 5068441 SHA256 e355ec10989829d485d2df08f076f6c3f598f7fc1d45d307b4fd70d5e609e6c4 SHA512 c222b250de6c8e182da1b534f459600a81b300c87578f9484b7d6f1fbbfaad9e8be70c306d0200b163850f48c974c55ce25782fefd55672ef72f03dc0b5f8d19 WHIRLPOOL 148bbce9bc3ffb1f9101e45936ce060aa49dbc88647effabf5418fa95ccdb91a4971d171d940de3307a2d59144e73250c43f8d8d79927ac36a1e02784f143061 DIST sqlite-doc-3081101.zip 5108061 SHA256 89e3fc4bce7463885da3b03602b4260fe07240f9ea674ba4ac7ce2ee4987357f SHA512 8a39e05b1647f4769126234b9759552138f3e3874bc008686ef2f9136833ddc30b3b0696222a736d604e8910a436acedc4954e46894f4adc085eb5f2b6ab9280 WHIRLPOOL f47308753f8df2c497e1bf3cd941b862d69d4f6bbabb2f0606d144966cbb186c5e1513022a5adc122939180fc6cfaa7c83a9537481cce455a83b7bf68deec9cd @@ -12,6 +13,7 @@ DIST sqlite-doc-3090100.zip 5289099 SHA256 c8549a4261f74395496d1ebc4b7d36a51b2b3 DIST sqlite-doc-3090200.zip 5295693 SHA256 4b9ecb9d2b0424ca2a288184ee36fa16a11033400638117dd7c669ad2d39177c SHA512 aef3b340613eed376dca491fd25b98ced30b69454b24412cb094854c53496bddfb479293634b46f1c793377981d4094c38a6b9c3e67775b471407c4d8cc21435 WHIRLPOOL bf0a660a5fb88c50d71beb12b07cb1eb269d564817d9aaef0a5903d114af8d9d74c803346ca00dea9ac6c76a722a3d305c6303c1220cd712162325c916174cfe DIST sqlite-doc-3100000.zip 5350213 SHA256 40af646d8c2109e5a15b1787e53524ed16c8e0d1705dda5f005b6186f18c2f2a SHA512 b04846e180d71c0bd3f76399f68df352ba663939a141fb1368f0099cfefb22e290ce1f5cf69eeb63a9136097c463ff9446670629f5b0662e5a230691c36e20c8 WHIRLPOOL 36802a6cb26b4f53945fcd79e5f665c0b9607ce8207fd647ac2735fb30fdba0419c0ecdfc946f74bd237fe646857bbb01a93c1e5135bd6aa13827c691d69c888 DIST sqlite-doc-3100200.zip 5374707 SHA256 21637344807efb9b6c6f615fd98b72620d074c720660940182888a4dbc2af982 SHA512 188f7b982066ba6680b13966b2d6f2c466fb99bef0c5c8ee0ca1a18a6760e5a26eef43ef985f2c9031e4299c27dc91a444f113549353c3209c5b50b97015aabb WHIRLPOOL f614a00fe9cc12e97f5c1bff6af008c3eeca5aa761656b0af3a1b790bee697f8316da2b57c457eb4c252463834b51a89911b9117c7d4508d4eba85eb73780a6b +DIST sqlite-doc-3110000.zip 5382519 SHA256 4a942d89d5bf0aa70c0a01267a52961632b27512c293eb6452f6efe909dcec50 SHA512 1c9a17c1461bae78d34a89a7c2bc7e7108d95ece40c909835fc08a7f332823a152a7a357f83755d66307336ce116d9539ef67be44c5e11ec742721ac819fd708 WHIRLPOOL 742df247b6930062cf0904d03a9e543c1affc8f592f8675a99a95acf34501cc14b47ca9eb7ee8062f83960cfdb62b2a05656989e2438d45fe70c90c2c5ce518a DIST sqlite-src-3081001.zip 7648823 SHA256 def6e2401c8da91b489de19d1a1734f722b4e629148ab804776d27b49ba49e7b SHA512 7604ac35eddd4aca53c02b0ab7ae7682856aec2eb4e6a9627da041ea19d464bb6080a70d84070a94abf77eb14ae616a0a8c5fe2f2a6c19fc899d1b21535d3e1a WHIRLPOOL c44e4f446d12af1f4df49e171276d853381784e979d3521cafbfdd5b5359c792586d298f3573bbda8a260b9008a4b7fcdc4ce0382fdda18574287018a2cb4f4c DIST sqlite-src-3081002.zip 7648737 SHA256 fda379bc4590761838d02ac8008433b7c3eae6e120e45d639d24b09d0004b42d SHA512 99661c709ffe8d5776c3ed2c1a64c70f541b68f0c7745e3e769528273966f71eeb29e8911d42ede9420f179b7fcbda63c4d0980a9d7bc05e937d0a6deb7b814f WHIRLPOOL 4e13138a5f92f5c5fe65c8b670097b57ea778244a37a5bcabf75f86f4ac3f0bc17860f3e55833adc9adcc335b6aece396c685421b58ccb0ddca66f37edfda7fc DIST sqlite-src-3081101.zip 9057103 SHA256 261ad454663f66fda6101b278bb7b3931cf01884deefbf4ea6b152f83a624662 SHA512 e84048a4a7f9c51219698b59d45c0c533ffe46ba6a20b96ca40f8066fd3825f80f963283d61dc22b2eb5bbca35db3ed4a6e13b1ab3c8b70b0af83469d2760f16 WHIRLPOOL c1add1e5a269546883e58c1666b8acdc58b16b6ad37ea546c99c8ece3348196d5ba33effb17fc773f4d49b1ee45583de7fec3fbe2f6d48e95fdfe4a802c6a824 @@ -19,3 +21,4 @@ DIST sqlite-src-3090100.zip 9283333 SHA256 9a572415375d709d347c316b36c59a9181831 DIST sqlite-src-3090200.zip 9284007 SHA256 d0899e14797ded1e3cfdd7280c8fb485a07c64f44559df1d0290937997c4451d SHA512 59dad1a6e6ac68b93a158b66758a529cbc1d3c0225746f5dd9acb79274e55c440be483b7796ba6da8686f448594dc13238f5e4f1a8fbedb9baf12ad9169d79f8 WHIRLPOOL cbde5d16b7540e1b1fb4c78d8c8fb978f65d022bab5e5c2448f5d81c003be19cd1905fa3108b7a8a50531755d3825e75405d42245381e6b1d61cc85b9c8b7434 DIST sqlite-src-3100000.zip 9222423 SHA256 7dd893f5569f0aa2fdd4f463f1f4ee670cff3f493d880d5e365c72fcdd777566 SHA512 70f09a41e516a8152e5e3b08e4e2e2e54dbe2976c89c4dfca08efbf2124dd3f73ef1d3b49742e03ea92fb99061c1ac67e0d7ad6d327c194faec0f48a1550264e WHIRLPOOL 7ffa03e617c7d53eeccacb178f4fece689e4bf7bbdee07ab532e93fa018a977a9604ae967ca6aa325606ee69ed77a4c2e7fbb24fe1800dc94b91f84f18f6a446 DIST sqlite-src-3100200.zip 9223036 SHA256 a45e1574e77951116cef6ad7eb79a683385a3a33fc78037e3cfcfd9243c4fb86 SHA512 08bd94f6fc282ab9e30e602c5eb27e0611bd7d9841f1135b037b9a3b09055f88a0351ce4973753fbd186ac912cdb2cf2e62835c67c35f9146697147bd7b7713d WHIRLPOOL 2a3de53f7eb944edb31602c121c2be518d1ce28d8b21933ac262fac7f48e803b9267ea0abbc7b578b44bc1104d65c4610a862c821f9797806fb674a7ab32729c +DIST sqlite-src-3110000.zip 9293025 SHA256 ac670e151222f5deee88d7883d8d509a874fe0e5df288659ada011ca8b435db0 SHA512 c83c1449e4f39f3aa22522a0ae8afa875259a7e1db7af129a7d185246567337435093d1f3a21a5038bbc97e35bb582b240ecffbe24d9fd6b60012016b9ebeecc WHIRLPOOL bcee84e44827a2a051b7d7b99e6e636373d656cf682eb12dae33bb884f4596f5223007a0e4f13993edb8da13551acb2d0957e6c53260d1ff056ac44c3fecb7d8 diff --git a/dev-db/sqlite/files/sqlite-3.11.0-full_tarball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch b/dev-db/sqlite/files/sqlite-3.11.0-full_tarball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch new file mode 100644 index 0000000..9aaf244 --- /dev/null +++ b/dev-db/sqlite/files/sqlite-3.11.0-full_tarball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch @@ -0,0 +1,443 @@ +https://www.sqlite.org/cgi/src/info/374b5108087a2eae + +--- ext/fts3/fts3_tokenizer.c ++++ ext/fts3/fts3_tokenizer.c +@@ -30,6 +30,18 @@ + #include <string.h> + + /* ++** Return true if the two-argument version of fts3_tokenizer() ++** has been activated via a prior call to sqlite3_db_config(db, ++** SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, 0); ++*/ ++static int fts3TokenizerEnabled(sqlite3_context *context){ ++ sqlite3 *db = sqlite3_context_db_handle(context); ++ int isEnabled = 0; ++ sqlite3_db_config(db,SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER,-1,&isEnabled); ++ return isEnabled; ++} ++ ++/* + ** Implementation of the SQL scalar function for accessing the underlying + ** hash table. This function may be called as follows: + ** +@@ -49,7 +61,7 @@ + ** is a blob containing the pointer stored as the hash data corresponding + ** to string <key-name> (after the hash-table is updated, if applicable). + */ +-static void scalarFunc( ++static void fts3TokenizerFunc( + sqlite3_context *context, + int argc, + sqlite3_value **argv +@@ -67,27 +79,23 @@ + nName = sqlite3_value_bytes(argv[0])+1; + + if( argc==2 ){ +-#ifdef SQLITE_ENABLE_FTS3_TOKENIZER +- void *pOld; +- int n = sqlite3_value_bytes(argv[1]); +- if( zName==0 || n!=sizeof(pPtr) ){ +- sqlite3_result_error(context, "argument type mismatch", -1); +- return; +- } +- pPtr = *(void **)sqlite3_value_blob(argv[1]); +- pOld = sqlite3Fts3HashInsert(pHash, (void *)zName, nName, pPtr); +- if( pOld==pPtr ){ +- sqlite3_result_error(context, "out of memory", -1); ++ if( fts3TokenizerEnabled(context) ){ ++ void *pOld; ++ int n = sqlite3_value_bytes(argv[1]); ++ if( zName==0 || n!=sizeof(pPtr) ){ ++ sqlite3_result_error(context, "argument type mismatch", -1); ++ return; ++ } ++ pPtr = *(void **)sqlite3_value_blob(argv[1]); ++ pOld = sqlite3Fts3HashInsert(pHash, (void *)zName, nName, pPtr); ++ if( pOld==pPtr ){ ++ sqlite3_result_error(context, "out of memory", -1); ++ } ++ }else{ ++ sqlite3_result_error(context, "fts3tokenize disabled", -1); + return; + } +-#else +- sqlite3_result_error(context, "fts3tokenize: " +- "disabled - rebuild with -DSQLITE_ENABLE_FTS3_TOKENIZER", -1 +- ); +- return; +-#endif /* SQLITE_ENABLE_FTS3_TOKENIZER */ +- }else +- { ++ }else{ + if( zName ){ + pPtr = sqlite3Fts3HashFind(pHash, zName, nName); + } +@@ -98,7 +106,6 @@ + return; + } + } +- + sqlite3_result_blob(context, (void *)&pPtr, sizeof(pPtr), SQLITE_TRANSIENT); + } + +@@ -336,7 +343,6 @@ + Tcl_DecrRefCount(pRet); + } + +-#ifdef SQLITE_ENABLE_FTS3_TOKENIZER + static + int registerTokenizer( + sqlite3 *db, +@@ -358,7 +364,6 @@ + + return sqlite3_finalize(pStmt); + } +-#endif /* SQLITE_ENABLE_FTS3_TOKENIZER */ + + + static +@@ -431,13 +436,13 @@ + assert( 0==strcmp(sqlite3_errmsg(db), "unknown tokenizer: nosuchtokenizer") ); + + /* Test the storage function */ +-#ifdef SQLITE_ENABLE_FTS3_TOKENIZER +- rc = registerTokenizer(db, "nosuchtokenizer", p1); +- assert( rc==SQLITE_OK ); +- rc = queryTokenizer(db, "nosuchtokenizer", &p2); +- assert( rc==SQLITE_OK ); +- assert( p2==p1 ); +-#endif ++ if( fts3TokenizerEnabled(context) ){ ++ rc = registerTokenizer(db, "nosuchtokenizer", p1); ++ assert( rc==SQLITE_OK ); ++ rc = queryTokenizer(db, "nosuchtokenizer", &p2); ++ assert( rc==SQLITE_OK ); ++ assert( p2==p1 ); ++ } + + sqlite3_result_text(context, "ok", -1, SQLITE_STATIC); + } +@@ -453,7 +458,7 @@ + ** sqlite3Fts3HashInit(pHash, FTS3_HASH_STRING, 1); + ** + ** This function adds a scalar function (see header comment above +-** scalarFunc() in this file for details) and, if ENABLE_TABLE is ++** fts3TokenizerFunc() in this file for details) and, if ENABLE_TABLE is + ** defined at compilation time, a temporary virtual table (see header + ** comment above struct HashTableVtab) to the database schema. Both + ** provide read/write access to the contents of *pHash. +@@ -482,10 +487,10 @@ + #endif + + if( SQLITE_OK==rc ){ +- rc = sqlite3_create_function(db, zName, 1, any, p, scalarFunc, 0, 0); ++ rc = sqlite3_create_function(db, zName, 1, any, p, fts3TokenizerFunc, 0, 0); + } + if( SQLITE_OK==rc ){ +- rc = sqlite3_create_function(db, zName, 2, any, p, scalarFunc, 0, 0); ++ rc = sqlite3_create_function(db, zName, 2, any, p, fts3TokenizerFunc, 0, 0); + } + #ifdef SQLITE_TEST + if( SQLITE_OK==rc ){ +--- src/main.c ++++ src/main.c +@@ -797,8 +797,9 @@ + int op; /* The opcode */ + u32 mask; /* Mask of the bit in sqlite3.flags to set/clear */ + } aFlagOp[] = { +- { SQLITE_DBCONFIG_ENABLE_FKEY, SQLITE_ForeignKeys }, +- { SQLITE_DBCONFIG_ENABLE_TRIGGER, SQLITE_EnableTrigger }, ++ { SQLITE_DBCONFIG_ENABLE_FKEY, SQLITE_ForeignKeys }, ++ { SQLITE_DBCONFIG_ENABLE_TRIGGER, SQLITE_EnableTrigger }, ++ { SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, SQLITE_Fts3Tokenizer }, + }; + unsigned int i; + rc = SQLITE_ERROR; /* IMP: R-42790-23372 */ +@@ -2815,6 +2816,9 @@ + #if defined(SQLITE_ENABLE_OVERSIZE_CELL_CHECK) + | SQLITE_CellSizeCk + #endif ++#if defined(SQLITE_ENABLE_FTS3_TOKENIZER) ++ | SQLITE_Fts3Tokenizer ++#endif + ; + sqlite3HashInit(&db->aCollSeq); + #ifndef SQLITE_OMIT_VIRTUALTABLE +--- src/sqlite.h.in ++++ src/sqlite.h.in +@@ -1904,11 +1904,25 @@ + ** following this call. The second parameter may be a NULL pointer, in + ** which case the trigger setting is not reported back. </dd> + ** ++** <dt>SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER</dt> ++** <dd> ^This option is used to enable or disable the two-argument ++** version of the [fts3_tokenizer()] function which is part of the ++** [FTS3] full-text search engine extension. ++** There should be two additional arguments. ++** The first argument is an integer which is 0 to disable fts3_tokenizer() or ++** positive to enable fts3_tokenizer() or negative to leave the setting ++** unchanged. ++** The second parameter is a pointer to an integer into which ++** is written 0 or 1 to indicate whether fts3_tokenizer is disabled or enabled ++** following this call. The second parameter may be a NULL pointer, in ++** which case the new setting is not reported back. </dd> ++** + ** </dl> + */ +-#define SQLITE_DBCONFIG_LOOKASIDE 1001 /* void* int int */ +-#define SQLITE_DBCONFIG_ENABLE_FKEY 1002 /* int int* */ +-#define SQLITE_DBCONFIG_ENABLE_TRIGGER 1003 /* int int* */ ++#define SQLITE_DBCONFIG_LOOKASIDE 1001 /* void* int int */ ++#define SQLITE_DBCONFIG_ENABLE_FKEY 1002 /* int int* */ ++#define SQLITE_DBCONFIG_ENABLE_TRIGGER 1003 /* int int* */ ++#define SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER 1004 /* int int* */ + + + /* +--- src/sqliteInt.h ++++ src/sqliteInt.h +@@ -1317,6 +1317,7 @@ + #define SQLITE_VdbeEQP 0x04000000 /* Debug EXPLAIN QUERY PLAN */ + #define SQLITE_Vacuum 0x08000000 /* Currently in a VACUUM */ + #define SQLITE_CellSizeCk 0x10000000 /* Check btree cell sizes on load */ ++#define SQLITE_Fts3Tokenizer 0x20000000 /* Enable fts3_tokenizer(2) */ + + + /* +--- src/test1.c ++++ src/test1.c +@@ -6921,6 +6921,53 @@ + } + + /* ++** tclcmd: sqlite3_db_config DB SETTING VALUE ++** ++** Invoke sqlite3_db_config() for one of the setting values. ++*/ ++static int test_sqlite3_db_config( ++ void *clientData, ++ Tcl_Interp *interp, ++ int objc, ++ Tcl_Obj *CONST objv[] ++){ ++ static const struct { ++ const char *zName; ++ int eVal; ++ } aSetting[] = { ++ { "FKEY", SQLITE_DBCONFIG_ENABLE_FKEY }, ++ { "TRIGGER", SQLITE_DBCONFIG_ENABLE_TRIGGER }, ++ { "FTS3_TOKENIZER", SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER }, ++ }; ++ int i; ++ int v; ++ const char *zSetting; ++ sqlite3 *db; ++ ++ if( objc!=4 ){ ++ Tcl_WrongNumArgs(interp, 1, objv, "DB SETTING VALUE"); ++ return TCL_ERROR; ++ } ++ if( getDbPointer(interp, Tcl_GetString(objv[1]), &db) ) return TCL_ERROR; ++ zSetting = Tcl_GetString(objv[2]); ++ if( sqlite3_strglob("SQLITE_*", zSetting)==0 ) zSetting += 7; ++ if( sqlite3_strglob("DBCONFIG_*", zSetting)==0 ) zSetting += 9; ++ if( sqlite3_strglob("ENABLE_*", zSetting)==0 ) zSetting += 7; ++ for(i=0; i<ArraySize(aSetting); i++){ ++ if( strcmp(zSetting, aSetting[i].zName)==0 ) break; ++ } ++ if( i>=ArraySize(aSetting) ){ ++ Tcl_SetObjResult(interp, ++ Tcl_NewStringObj("unknown sqlite3_db_config setting", -1)); ++ return TCL_ERROR; ++ } ++ if( Tcl_GetIntFromObj(interp, objv[3], &v) ) return TCL_ERROR; ++ sqlite3_db_config(db, aSetting[i].eVal, v, &v); ++ Tcl_SetObjResult(interp, Tcl_NewIntObj(v)); ++ return TCL_OK; ++} ++ ++/* + ** Register commands with the TCL interpreter. + */ + int Sqlitetest1_Init(Tcl_Interp *interp){ +@@ -6989,6 +7036,7 @@ + Tcl_ObjCmdProc *xProc; + void *clientData; + } aObjCmd[] = { ++ { "sqlite3_db_config", test_sqlite3_db_config, 0 }, + { "bad_behavior", test_bad_behavior, (void*)&iZero }, + { "register_dbstat_vtab", test_register_dbstat_vtab }, + { "sqlite3_connection_pointer", get_sqlite_pointer, 0 }, +--- src/test_config.c ++++ src/test_config.c +@@ -370,12 +370,6 @@ + Tcl_SetVar2(interp, "sqlite_options", "fts3", "0", TCL_GLOBAL_ONLY); + #endif + +-#ifdef SQLITE_ENABLE_FTS3_TOKENIZER +- Tcl_SetVar2(interp, "sqlite_options", "fts3_tokenizer", "1", TCL_GLOBAL_ONLY); +-#else +- Tcl_SetVar2(interp, "sqlite_options", "fts3_tokenizer", "0", TCL_GLOBAL_ONLY); +-#endif +- + #ifdef SQLITE_ENABLE_FTS5 + Tcl_SetVar2(interp, "sqlite_options", "fts5", "1", TCL_GLOBAL_ONLY); + #else +--- test/fts3atoken.test ++++ test/fts3atoken.test +@@ -56,40 +56,41 @@ + # + # 5: Test that the table created to use tokenizer 'blah' is usable. + # +-ifcapable fts3_tokenizer { +- do_test fts3atoken-1.1 { +- catchsql { +- CREATE VIRTUAL TABLE t1 USING fts3(content, tokenize blah); +- } +- } {1 {unknown tokenizer: blah}} +- do_test fts3atoken-1.2 { +- execsql { +- SELECT fts3_tokenizer('blah', fts3_tokenizer('simple')) IS NULL; +- } +- } {0} +- do_test fts3atoken-1.3 { +- execsql { +- SELECT fts3_tokenizer('blah') == fts3_tokenizer('simple'); +- } +- } {1} +- do_test fts3atoken-1.4 { +- catchsql { +- CREATE VIRTUAL TABLE t1 USING fts3(content, tokenize blah); +- } +- } {0 {}} +- do_test fts3atoken-1.5 { +- execsql { +- INSERT INTO t1(content) VALUES('There was movement at the station'); +- INSERT INTO t1(content) VALUES('For the word has passed around'); +- INSERT INTO t1(content) VALUES('That the colt from ol regret had got'); +- SELECT content FROM t1 WHERE content MATCH 'movement' +- } +- } {{There was movement at the station}} +-} else { +- do_catchsql_test 1.6 { ++sqlite3_db_config db SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER 1 ++do_test fts3atoken-1.1 { ++ catchsql { ++ CREATE VIRTUAL TABLE t1 USING fts3(content, tokenize blah); ++ } ++} {1 {unknown tokenizer: blah}} ++do_test fts3atoken-1.2 { ++ execsql { + SELECT fts3_tokenizer('blah', fts3_tokenizer('simple')) IS NULL; +- } {1 {fts3tokenize: disabled - rebuild with -DSQLITE_ENABLE_FTS3_TOKENIZER}} +-} ++ } ++} {0} ++do_test fts3atoken-1.3 { ++ execsql { ++ SELECT fts3_tokenizer('blah') == fts3_tokenizer('simple'); ++ } ++} {1} ++do_test fts3atoken-1.4 { ++ catchsql { ++ CREATE VIRTUAL TABLE t1 USING fts3(content, tokenize blah); ++ } ++} {0 {}} ++do_test fts3atoken-1.5 { ++ execsql { ++ INSERT INTO t1(content) VALUES('There was movement at the station'); ++ INSERT INTO t1(content) VALUES('For the word has passed around'); ++ INSERT INTO t1(content) VALUES('That the colt from ol regret had got'); ++ SELECT content FROM t1 WHERE content MATCH 'movement' ++ } ++} {{There was movement at the station}} ++ ++sqlite3_db_config db SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER 0 ++do_catchsql_test 1.6 { ++ SELECT fts3_tokenizer('blah', fts3_tokenizer('simple')) IS NULL; ++} {1 {fts3tokenize disabled}} ++ + + #-------------------------------------------------------------------------- + # Test cases fts3atoken-2.* test error cases in the scalar function based +@@ -212,14 +213,14 @@ + do_catchsql_test 6.2.1 { + SELECT fts3_tokenizer(NULL); + } {1 {unknown tokenizer: }} +-ifcapable fts3_tokenizer { +- do_catchsql_test 6.2.2 { +- SELECT fts3_tokenizer(NULL, X'1234567812345678'); +- } {1 {argument type mismatch}} +- do_catchsql_test 6.2.3 { +- SELECT fts3_tokenizer(NULL, X'12345678'); +- } {1 {argument type mismatch}} +-} ++ ++sqlite3_db_config db SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER 1 ++do_catchsql_test 6.2.2 { ++ SELECT fts3_tokenizer(NULL, X'1234567812345678'); ++} {1 {argument type mismatch}} ++do_catchsql_test 6.2.3 { ++ SELECT fts3_tokenizer(NULL, X'12345678'); ++} {1 {argument type mismatch}} + + + finish_test +--- test/fts4langid.test ++++ test/fts4langid.test +@@ -358,31 +358,30 @@ + } + } + +-ifcapable fts3_tokenizer { +- do_test 4.1.0 { +- reset_db +- set ptr [fts3_test_tokenizer] +- execsql { SELECT fts3_tokenizer('testtokenizer', $ptr) } +- build_multilingual_db_2 db +- } {} +- do_execsql_test 4.1.1 { +- SELECT docid FROM t4 WHERE t4 MATCH 'quick'; +- } {0} +- do_execsql_test 4.1.2 { +- SELECT docid FROM t4 WHERE t4 MATCH 'quick' AND lid=1; +- } {} +- do_execsql_test 4.1.3 { +- SELECT docid FROM t4 WHERE t4 MATCH 'Quick' AND lid=1; +- } {1} +- for {set i 0} {$i < 50} {incr i} { +- do_execsql_test 4.1.4.$i { +- SELECT count(*) FROM t4 WHERE t4 MATCH 'fox' AND lid=$i; +- } [expr 0==($i%2)] +- } +- do_catchsql_test 4.1.5 { +- INSERT INTO t4(content, lid) VALUES('hello world', 101) +- } {1 {SQL logic error or missing database}} ++do_test 4.1.0 { ++ reset_db ++ set ptr [fts3_test_tokenizer] ++ sqlite3_db_config db SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER 1 ++ execsql { SELECT fts3_tokenizer('testtokenizer', $ptr) } ++ build_multilingual_db_2 db ++} {} ++do_execsql_test 4.1.1 { ++ SELECT docid FROM t4 WHERE t4 MATCH 'quick'; ++} {0} ++do_execsql_test 4.1.2 { ++ SELECT docid FROM t4 WHERE t4 MATCH 'quick' AND lid=1; ++} {} ++do_execsql_test 4.1.3 { ++ SELECT docid FROM t4 WHERE t4 MATCH 'Quick' AND lid=1; ++} {1} ++for {set i 0} {$i < 50} {incr i} { ++ do_execsql_test 4.1.4.$i { ++ SELECT count(*) FROM t4 WHERE t4 MATCH 'fox' AND lid=$i; ++ } [expr 0==($i%2)] + } ++do_catchsql_test 4.1.5 { ++ INSERT INTO t4(content, lid) VALUES('hello world', 101) ++} {1 {SQL logic error or missing database}} + + #------------------------------------------------------------------------- + # Test cases 5.* diff --git a/dev-db/sqlite/files/sqlite-3.11.0-full_tarball-build.patch b/dev-db/sqlite/files/sqlite-3.11.0-full_tarball-build.patch new file mode 100644 index 0000000..4745f05 --- /dev/null +++ b/dev-db/sqlite/files/sqlite-3.11.0-full_tarball-build.patch @@ -0,0 +1,132 @@ +Link executables against libsqlite3.so. +Increase timeout for fuzzcheck. +Fix building with dlopen() not available. + +--- Makefile.in ++++ Makefile.in +@@ -550,7 +550,7 @@ + # Extra compiler options for various shell tools + # + SHELL_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS4 +-SHELL_OPT += -DSQLITE_ENABLE_EXPLAIN_COMMENTS ++SHELL_OPT += -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_DBSTAT_VTAB + FUZZERSHELL_OPT = -DSQLITE_ENABLE_JSON1 + FUZZCHECK_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5 + +@@ -571,18 +571,18 @@ + + libtclsqlite3.la: tclsqlite.lo libsqlite3.la + $(LTLINK) -no-undefined -o $@ tclsqlite.lo \ +- libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \ ++ libsqlite3.la @TCL_STUB_LIB_SPEC@ \ + -rpath "$(TCLLIBDIR)" \ + -version-info "8:6:8" \ + -avoid-version + +-sqlite3$(TEXE): $(TOP)/src/shell.c sqlite3.c +- $(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \ +- $(TOP)/src/shell.c sqlite3.c \ +- $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)" ++sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la ++ $(LTLINK) $(READLINE_FLAGS) -o $@ \ ++ $(TOP)/src/shell.c libsqlite3.la \ ++ $(LIBREADLINE) + +-sqldiff$(TEXE): $(TOP)/tool/sqldiff.c sqlite3.c sqlite3.h +- $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.c $(TLIBS) ++sqldiff$(TEXE): $(TOP)/tool/sqldiff.c libsqlite3.la ++ $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c libsqlite3.la + + srcck1$(BEXE): $(TOP)/tool/srcck1.c + $(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c +@@ -650,7 +650,7 @@ + # Rule to build the amalgamation + # + sqlite3.lo: sqlite3.c +- $(LTCOMPILE) $(TEMP_STORE) -c sqlite3.c ++ $(LTCOMPILE) $(SHELL_OPT) $(TEMP_STORE) -c sqlite3.c + + # Rules to build the LEMON compiler generator + # +@@ -1074,13 +1074,13 @@ + + # Fuzz testing + fuzztest: fuzzcheck$(TEXE) $(FUZZDATA) +- ./fuzzcheck$(TEXE) $(FUZZDATA) ++ ./fuzzcheck$(TEXE) --timeout 3600 $(FUZZDATA) + + fastfuzztest: fuzzcheck$(TEXE) $(FUZZDATA) +- ./fuzzcheck$(TEXE) --limit-mem 100M $(FUZZDATA) ++ ./fuzzcheck$(TEXE) --limit-mem 100M --timeout 3600 $(FUZZDATA) + + valgrindfuzz: fuzzcheck$(TEXT) $(FUZZDATA) +- valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA) ++ valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 3600 $(FUZZDATA) + + # Minimal testing that runs in less than 3 minutes + # +@@ -1106,29 +1106,29 @@ + smoketest: $(TESTPROGS) fuzzcheck$(TEXE) + ./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS) + +-sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl ++sqlite3_analyzer.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl + echo "#define TCLSH 2" > $@ + echo "#define SQLITE_ENABLE_DBSTAT_VTAB 1" >> $@ +- cat sqlite3.c $(TOP)/src/tclsqlite.c >> $@ ++ cat $(TOP)/src/tclsqlite.c >> $@ + echo "static const char *tclsh_main_loop(void){" >> $@ + echo "static const char *zMainloop = " >> $@ + $(TCLSH_CMD) $(TOP)/tool/tostr.tcl $(TOP)/tool/spaceanal.tcl >> $@ + echo "; return zMainloop; }" >> $@ + +-sqlite3_analyzer$(TEXE): sqlite3_analyzer.c +- $(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS) ++sqlite3_analyzer$(TEXE): sqlite3_analyzer.c libsqlite3.la ++ $(LTLINK) sqlite3_analyzer.c -o $@ libsqlite3.la $(LIBTCL) + +-showdb$(TEXE): $(TOP)/tool/showdb.c sqlite3.lo +- $(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS) ++showdb$(TEXE): $(TOP)/tool/showdb.c libsqlite3.la ++ $(LTLINK) -o $@ $(TOP)/tool/showdb.c libsqlite3.la + +-showstat4$(TEXE): $(TOP)/tool/showstat4.c sqlite3.lo +- $(LTLINK) -o $@ $(TOP)/tool/showstat4.c sqlite3.lo $(TLIBS) ++showstat4$(TEXE): $(TOP)/tool/showstat4.c libsqlite3.la ++ $(LTLINK) -o $@ $(TOP)/tool/showstat4.c libsqlite3.la + +-showjournal$(TEXE): $(TOP)/tool/showjournal.c sqlite3.lo +- $(LTLINK) -o $@ $(TOP)/tool/showjournal.c sqlite3.lo $(TLIBS) ++showjournal$(TEXE): $(TOP)/tool/showjournal.c ++ $(LTLINK) -o $@ $(TOP)/tool/showjournal.c + +-showwal$(TEXE): $(TOP)/tool/showwal.c sqlite3.lo +- $(LTLINK) -o $@ $(TOP)/tool/showwal.c sqlite3.lo $(TLIBS) ++showwal$(TEXE): $(TOP)/tool/showwal.c ++ $(LTLINK) -o $@ $(TOP)/tool/showwal.c + + rollback-test$(TEXE): $(TOP)/tool/rollback-test.c sqlite3.lo + $(LTLINK) -o $@ $(TOP)/tool/rollback-test.c sqlite3.lo $(TLIBS) +@@ -1142,8 +1142,8 @@ + speedtest1$(TEXE): $(TOP)/test/speedtest1.c sqlite3.lo + $(LTLINK) -o $@ $(TOP)/test/speedtest1.c sqlite3.lo $(TLIBS) + +-rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo +- $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.lo $(TLIBS) ++rbu$(EXE): $(TOP)/ext/rbu/rbu.c libsqlite3.la ++ $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c libsqlite3.la + + loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la + $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS) +--- configure.ac ++++ configure.ac +@@ -570,6 +570,9 @@ + if test "${use_loadextension}" = "yes" ; then + OPT_FEATURE_FLAGS="" + AC_SEARCH_LIBS(dlopen, dl) ++ if test "${ac_cv_search_dlopen}" = "no" ; then ++ OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1" ++ fi + else + OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1" + fi diff --git a/dev-db/sqlite/files/sqlite-3.11.0-nonfull_tarball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch b/dev-db/sqlite/files/sqlite-3.11.0-nonfull_tarball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch new file mode 100644 index 0000000..0ed2517 --- /dev/null +++ b/dev-db/sqlite/files/sqlite-3.11.0-nonfull_tarball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch @@ -0,0 +1,232 @@ +https://www.sqlite.org/cgi/src/info/374b5108087a2eae + +--- sqlite3.c ++++ sqlite3.c +@@ -2121,11 +2121,25 @@ + ** following this call. The second parameter may be a NULL pointer, in + ** which case the trigger setting is not reported back. </dd> + ** ++** <dt>SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER</dt> ++** <dd> ^This option is used to enable or disable the two-argument ++** version of the [fts3_tokenizer()] function which is part of the ++** [FTS3] full-text search engine extension. ++** There should be two additional arguments. ++** The first argument is an integer which is 0 to disable fts3_tokenizer() or ++** positive to enable fts3_tokenizer() or negative to leave the setting ++** unchanged. ++** The second parameter is a pointer to an integer into which ++** is written 0 or 1 to indicate whether fts3_tokenizer is disabled or enabled ++** following this call. The second parameter may be a NULL pointer, in ++** which case the new setting is not reported back. </dd> ++** + ** </dl> + */ +-#define SQLITE_DBCONFIG_LOOKASIDE 1001 /* void* int int */ +-#define SQLITE_DBCONFIG_ENABLE_FKEY 1002 /* int int* */ +-#define SQLITE_DBCONFIG_ENABLE_TRIGGER 1003 /* int int* */ ++#define SQLITE_DBCONFIG_LOOKASIDE 1001 /* void* int int */ ++#define SQLITE_DBCONFIG_ENABLE_FKEY 1002 /* int int* */ ++#define SQLITE_DBCONFIG_ENABLE_TRIGGER 1003 /* int int* */ ++#define SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER 1004 /* int int* */ + + + /* +@@ -12206,6 +12220,7 @@ + #define SQLITE_VdbeEQP 0x04000000 /* Debug EXPLAIN QUERY PLAN */ + #define SQLITE_Vacuum 0x08000000 /* Currently in a VACUUM */ + #define SQLITE_CellSizeCk 0x10000000 /* Check btree cell sizes on load */ ++#define SQLITE_Fts3Tokenizer 0x20000000 /* Enable fts3_tokenizer(2) */ + + + /* +@@ -133589,8 +133604,9 @@ + int op; /* The opcode */ + u32 mask; /* Mask of the bit in sqlite3.flags to set/clear */ + } aFlagOp[] = { +- { SQLITE_DBCONFIG_ENABLE_FKEY, SQLITE_ForeignKeys }, +- { SQLITE_DBCONFIG_ENABLE_TRIGGER, SQLITE_EnableTrigger }, ++ { SQLITE_DBCONFIG_ENABLE_FKEY, SQLITE_ForeignKeys }, ++ { SQLITE_DBCONFIG_ENABLE_TRIGGER, SQLITE_EnableTrigger }, ++ { SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, SQLITE_Fts3Tokenizer }, + }; + unsigned int i; + rc = SQLITE_ERROR; /* IMP: R-42790-23372 */ +@@ -135607,6 +135623,9 @@ + #if defined(SQLITE_ENABLE_OVERSIZE_CELL_CHECK) + | SQLITE_CellSizeCk + #endif ++#if defined(SQLITE_ENABLE_FTS3_TOKENIZER) ++ | SQLITE_Fts3Tokenizer ++#endif + ; + sqlite3HashInit(&db->aCollSeq); + #ifndef SQLITE_OMIT_VIRTUALTABLE +@@ -146857,6 +146876,18 @@ + /* #include <string.h> */ + + /* ++** Return true if the two-argument version of fts3_tokenizer() ++** has been activated via a prior call to sqlite3_db_config(db, ++** SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, 0); ++*/ ++static int fts3TokenizerEnabled(sqlite3_context *context){ ++ sqlite3 *db = sqlite3_context_db_handle(context); ++ int isEnabled = 0; ++ sqlite3_db_config(db,SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER,-1,&isEnabled); ++ return isEnabled; ++} ++ ++/* + ** Implementation of the SQL scalar function for accessing the underlying + ** hash table. This function may be called as follows: + ** +@@ -146876,7 +146907,7 @@ + ** is a blob containing the pointer stored as the hash data corresponding + ** to string <key-name> (after the hash-table is updated, if applicable). + */ +-static void scalarFunc( ++static void fts3TokenizerFunc( + sqlite3_context *context, + int argc, + sqlite3_value **argv +@@ -146894,27 +146925,23 @@ + nName = sqlite3_value_bytes(argv[0])+1; + + if( argc==2 ){ +-#ifdef SQLITE_ENABLE_FTS3_TOKENIZER +- void *pOld; +- int n = sqlite3_value_bytes(argv[1]); +- if( zName==0 || n!=sizeof(pPtr) ){ +- sqlite3_result_error(context, "argument type mismatch", -1); +- return; +- } +- pPtr = *(void **)sqlite3_value_blob(argv[1]); +- pOld = sqlite3Fts3HashInsert(pHash, (void *)zName, nName, pPtr); +- if( pOld==pPtr ){ +- sqlite3_result_error(context, "out of memory", -1); ++ if( fts3TokenizerEnabled(context) ){ ++ void *pOld; ++ int n = sqlite3_value_bytes(argv[1]); ++ if( zName==0 || n!=sizeof(pPtr) ){ ++ sqlite3_result_error(context, "argument type mismatch", -1); ++ return; ++ } ++ pPtr = *(void **)sqlite3_value_blob(argv[1]); ++ pOld = sqlite3Fts3HashInsert(pHash, (void *)zName, nName, pPtr); ++ if( pOld==pPtr ){ ++ sqlite3_result_error(context, "out of memory", -1); ++ } ++ }else{ ++ sqlite3_result_error(context, "fts3tokenize disabled", -1); + return; + } +-#else +- sqlite3_result_error(context, "fts3tokenize: " +- "disabled - rebuild with -DSQLITE_ENABLE_FTS3_TOKENIZER", -1 +- ); +- return; +-#endif /* SQLITE_ENABLE_FTS3_TOKENIZER */ +- }else +- { ++ }else{ + if( zName ){ + pPtr = sqlite3Fts3HashFind(pHash, zName, nName); + } +@@ -146925,7 +146952,6 @@ + return; + } + } +- + sqlite3_result_blob(context, (void *)&pPtr, sizeof(pPtr), SQLITE_TRANSIENT); + } + +@@ -147163,7 +147189,6 @@ + Tcl_DecrRefCount(pRet); + } + +-#ifdef SQLITE_ENABLE_FTS3_TOKENIZER + static + int registerTokenizer( + sqlite3 *db, +@@ -147185,7 +147210,6 @@ + + return sqlite3_finalize(pStmt); + } +-#endif /* SQLITE_ENABLE_FTS3_TOKENIZER */ + + + static +@@ -147258,13 +147282,13 @@ + assert( 0==strcmp(sqlite3_errmsg(db), "unknown tokenizer: nosuchtokenizer") ); + + /* Test the storage function */ +-#ifdef SQLITE_ENABLE_FTS3_TOKENIZER +- rc = registerTokenizer(db, "nosuchtokenizer", p1); +- assert( rc==SQLITE_OK ); +- rc = queryTokenizer(db, "nosuchtokenizer", &p2); +- assert( rc==SQLITE_OK ); +- assert( p2==p1 ); +-#endif ++ if( fts3TokenizerEnabled(context) ){ ++ rc = registerTokenizer(db, "nosuchtokenizer", p1); ++ assert( rc==SQLITE_OK ); ++ rc = queryTokenizer(db, "nosuchtokenizer", &p2); ++ assert( rc==SQLITE_OK ); ++ assert( p2==p1 ); ++ } + + sqlite3_result_text(context, "ok", -1, SQLITE_STATIC); + } +@@ -147280,7 +147304,7 @@ + ** sqlite3Fts3HashInit(pHash, FTS3_HASH_STRING, 1); + ** + ** This function adds a scalar function (see header comment above +-** scalarFunc() in this file for details) and, if ENABLE_TABLE is ++** fts3TokenizerFunc() in this file for details) and, if ENABLE_TABLE is + ** defined at compilation time, a temporary virtual table (see header + ** comment above struct HashTableVtab) to the database schema. Both + ** provide read/write access to the contents of *pHash. +@@ -147309,10 +147333,10 @@ + #endif + + if( SQLITE_OK==rc ){ +- rc = sqlite3_create_function(db, zName, 1, any, p, scalarFunc, 0, 0); ++ rc = sqlite3_create_function(db, zName, 1, any, p, fts3TokenizerFunc, 0, 0); + } + if( SQLITE_OK==rc ){ +- rc = sqlite3_create_function(db, zName, 2, any, p, scalarFunc, 0, 0); ++ rc = sqlite3_create_function(db, zName, 2, any, p, fts3TokenizerFunc, 0, 0); + } + #ifdef SQLITE_TEST + if( SQLITE_OK==rc ){ +--- sqlite3.h ++++ sqlite3.h +@@ -1904,11 +1904,25 @@ + ** following this call. The second parameter may be a NULL pointer, in + ** which case the trigger setting is not reported back. </dd> + ** ++** <dt>SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER</dt> ++** <dd> ^This option is used to enable or disable the two-argument ++** version of the [fts3_tokenizer()] function which is part of the ++** [FTS3] full-text search engine extension. ++** There should be two additional arguments. ++** The first argument is an integer which is 0 to disable fts3_tokenizer() or ++** positive to enable fts3_tokenizer() or negative to leave the setting ++** unchanged. ++** The second parameter is a pointer to an integer into which ++** is written 0 or 1 to indicate whether fts3_tokenizer is disabled or enabled ++** following this call. The second parameter may be a NULL pointer, in ++** which case the new setting is not reported back. </dd> ++** + ** </dl> + */ +-#define SQLITE_DBCONFIG_LOOKASIDE 1001 /* void* int int */ +-#define SQLITE_DBCONFIG_ENABLE_FKEY 1002 /* int int* */ +-#define SQLITE_DBCONFIG_ENABLE_TRIGGER 1003 /* int int* */ ++#define SQLITE_DBCONFIG_LOOKASIDE 1001 /* void* int int */ ++#define SQLITE_DBCONFIG_ENABLE_FKEY 1002 /* int int* */ ++#define SQLITE_DBCONFIG_ENABLE_TRIGGER 1003 /* int int* */ ++#define SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER 1004 /* int int* */ + + + /* diff --git a/dev-db/sqlite/files/sqlite-3.11.0-nonfull_tarball-build.patch b/dev-db/sqlite/files/sqlite-3.11.0-nonfull_tarball-build.patch new file mode 100644 index 0000000..e0b477c --- /dev/null +++ b/dev-db/sqlite/files/sqlite-3.11.0-nonfull_tarball-build.patch @@ -0,0 +1,38 @@ +Link executables against libsqlite3.so. +Fix building with dlopen() not available. + +--- Makefile.am ++++ Makefile.am +@@ -1,15 +1,16 @@ + +-AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ @FTS5_FLAGS@ @JSON1_FLAGS@ -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE ++AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ @FTS5_FLAGS@ @JSON1_FLAGS@ -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE + + lib_LTLIBRARIES = libsqlite3.la + libsqlite3_la_SOURCES = sqlite3.c + libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8 + + bin_PROGRAMS = sqlite3 +-sqlite3_SOURCES = shell.c sqlite3.c sqlite3.h +-sqlite3_LDADD = @READLINE_LIBS@ ++sqlite3_SOURCES = shell.c sqlite3.h ++EXTRA_sqlite3_SOURCES = sqlite3.c ++sqlite3_LDADD = @EXTRA_SHELL_OBJ@ @READLINE_LIBS@ + sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@ +-sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS ++sqlite3_CFLAGS = $(AM_CFLAGS) + + include_HEADERS = sqlite3.h sqlite3ext.h + +--- configure.ac ++++ configure.ac +@@ -89,6 +89,9 @@ + [], [enable_dynamic_extensions=yes]) + if test x"$enable_dynamic_extensions" != "xno"; then + AC_SEARCH_LIBS(dlopen, dl) ++ if test "${ac_cv_search_dlopen}" = "no" ; then ++ DYNAMIC_EXTENSION_FLAGS=-DSQLITE_OMIT_LOAD_EXTENSION=1 ++ fi + else + DYNAMIC_EXTENSION_FLAGS=-DSQLITE_OMIT_LOAD_EXTENSION=1 + fi diff --git a/dev-db/sqlite/sqlite-3.11.0.ebuild b/dev-db/sqlite/sqlite-3.11.0.ebuild new file mode 100644 index 0000000..f73b1ad --- /dev/null +++ b/dev-db/sqlite/sqlite-3.11.0.ebuild @@ -0,0 +1,243 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator + +SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))" +DOC_PV="${SRC_PV}" +# DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))" + +DESCRIPTION="A SQL Database Engine in a C Library" +HOMEPAGE="http://sqlite.org/"; +SRC_URI="doc? ( http://sqlite.org/2016/${PN}-doc-${DOC_PV}.zip ) + tcl? ( http://sqlite.org/2016/${PN}-src-${SRC_PV}.zip ) + test? ( http://sqlite.org/2016/${PN}-src-${SRC_PV}.zip ) + tools? ( http://sqlite.org/2016/${PN}-src-${SRC_PV}.zip ) + !tcl? ( !test? ( !tools? ( http://sqlite.org/2016/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )" + +LICENSE="public-domain" +SLOT="3" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="debug doc icu +readline secure-delete static-libs tcl test tools" + +RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] ) + readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) + tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] ) + tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] ) + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-baselibs-20131008-r14 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + )" +DEPEND="${RDEPEND} + doc? ( app-arch/unzip ) + tcl? ( app-arch/unzip ) + test? ( + app-arch/unzip + dev-lang/tcl:0[${MULTILIB_USEDEP}] + ) + tools? ( app-arch/unzip )" + +full_tarball() { + use tcl || use test || use tools +} + +pkg_setup() { + if full_tarball; then + S="${WORKDIR}/${PN}-src-${SRC_PV}" + else + S="${WORKDIR}/${PN}-autoconf-${SRC_PV}" + fi +} + +src_prepare() { + if full_tarball; then + epatch "${FILESDIR}/${PN}-3.11.0-full_tarball-build.patch" + epatch "${FILESDIR}/${PN}-3.11.0-full_tarball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch" + + # Fix shell1-5.0 test. + # http://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2015-May/002575.html + sed -e "/if {\$i==0x0D /s/\$i==0x0D /&|| (\$i>=0xE0 \&\& \$i<=0xEF) /" -i test/shell1.test + else + epatch "${FILESDIR}/${PN}-3.11.0-nonfull_tarball-build.patch" + epatch "${FILESDIR}/${PN}-3.11.0-nonfull_tarball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch" + fi + + eautoreconf + + multilib_copy_sources +} + +multilib_src_configure() { + local CPPFLAGS="${CPPFLAGS}" options=() + + options+=( + --enable-$(full_tarball && echo load-extension || echo dynamic-extensions) + --enable-threadsafe + ) + if ! full_tarball; then + options+=(--disable-static-shell) + fi + + # Support detection of misuse of SQLite API. + # http://sqlite.org/compile.html#enable_api_armor + append-cppflags -DSQLITE_ENABLE_API_ARMOR + + # Support column metadata functions. + # http://sqlite.org/c3ref/column_database_name.html + append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA + + # Support dbstat virtual table. + # http://sqlite.org/dbstat.html + append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB + + # Support Full-Text Search versions 3, 4 and 5. + # http://sqlite.org/fts3.html + # http://sqlite.org/fts5.html + append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 + options+=(--enable-fts5) + + # Support hidden columns. + append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS + + # Support JSON1 extension. + # http://sqlite.org/json1.html + append-cppflags -DSQLITE_ENABLE_JSON1 + + # Support Resumable Bulk Update extension. + # http://sqlite.org/rbu.html + append-cppflags -DSQLITE_ENABLE_RBU + + # Support R*Trees. + # http://sqlite.org/rtree.html + append-cppflags -DSQLITE_ENABLE_RTREE + + # Support scan status functions. + # http://sqlite.org/c3ref/stmt_scanstatus.html + # http://sqlite.org/c3ref/stmt_scanstatus_reset.html + append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS + + # Support unlock notification. + # http://sqlite.org/unlock_notify.html + append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY + + # Support soundex() function. + # http://sqlite.org/lang_corefunc.html#soundex + append-cppflags -DSQLITE_SOUNDEX + + # debug USE flag. + if full_tarball; then + options+=($(use_enable debug)) + else + if use debug; then + append-cppflags -DSQLITE_DEBUG + else + append-cppflags -DNDEBUG + fi + fi + + # icu USE flag. + if use icu; then + # Support ICU extension. + # http://sqlite.org/compile.html#enable_icu + append-cppflags -DSQLITE_ENABLE_ICU + if full_tarball; then + sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed" + else + sed -e "s/^LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed" + fi + fi + + # readline USE flag. + options+=( + --disable-editline + $(use_enable readline) + ) + if full_tarball && use readline; then + options+=(--with-readline-inc="-I${EPREFIX}/usr/include/readline") + fi + + # secure-delete USE flag. + if use secure-delete; then + # Enable secure_delete pragma by default. + # http://sqlite.org/pragma.html#pragma_secure_delete + append-cppflags -DSQLITE_SECURE_DELETE + fi + + # static-libs USE flag. + options+=($(use_enable static-libs static)) + + # tcl, test, tools USE flags. + if full_tarball; then + options+=(--enable-tcl) + fi + + if [[ "${CHOST}" == *-mint* ]]; then + append-cppflags -DSQLITE_OMIT_WAL + fi + + # Use pread(), pread64(), pwrite(), pwrite64() functions for better performance if they are available. + if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -Werror=implicit-function-declaration -x c - -o "${T}/pread_pwrite_test" <<< $'#include <unistd.h>\nint main()\n{\n pread(0, NULL, 0, 0);\n pwrite(0, NULL, 0, 0);\n return 0;\n}' &> /dev/null; then + append-cppflags -DUSE_PREAD + fi + if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -Werror=implicit-function-declaration -x c - -o "${T}/pread64_pwrite64_test" <<< $'#include <unistd.h>\nint main()\n{\n pread64(0, NULL, 0, 0);\n pwrite64(0, NULL, 0, 0);\n return 0;\n}' &> /dev/null; then + append-cppflags -DUSE_PREAD64 + elif $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -D_LARGEFILE64_SOURCE -Werror=implicit-function-declaration -x c - -o "${T}/pread64_pwrite64_test" <<< $'#include <unistd.h>\nint main()\n{\n pread64(0, NULL, 0, 0);\n pwrite64(0, NULL, 0, 0);\n return 0;\n}' &> /dev/null; then + append-cppflags -DUSE_PREAD64 -D_LARGEFILE64_SOURCE + fi + + econf "${options[@]}" +} + +multilib_src_compile() { + emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" + + if use tools && multilib_is_native_abi; then + emake rbu showdb showjournal showstat4 showwal sqldiff sqlite3_analyzer + fi +} + +multilib_src_test() { + if [[ "${EUID}" -eq 0 ]]; then + ewarn "Skipping tests due to root permissions" + return + fi + + emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test) +} + +multilib_src_install() { + emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install + + if use tools && multilib_is_native_abi; then + install_tool() { + if [[ -f ".libs/${1}" ]]; then + newbin ".libs/${1}" "${2}" + else + newbin "${1}" "${2}" + fi + } + + install_tool rbu sqlite3-rbu + install_tool showdb sqlite3-show-db + install_tool showjournal sqlite3-show-journal + install_tool showstat4 sqlite3-show-stat4 + install_tool showwal sqlite3-show-wal + install_tool sqldiff sqlite3-diff + install_tool sqlite3_analyzer sqlite3-analyzer + + unset -f install_tool + fi +} + +multilib_src_install_all() { + prune_libtool_files + + doman sqlite3.1 + + if use doc; then + dohtml -A ico,odf,odg,pdf,svg -r "${WORKDIR}/${PN}-doc-${DOC_PV}/" + fi +}
