* [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlite/files/
@ 2016-07-29 2:00 Mike Gilbert
0 siblings, 0 replies; 8+ messages in thread
From: Mike Gilbert @ 2016-07-29 2:00 UTC (permalink / raw
To: gentoo-commits
commit: f978cfd53ddb7555e0f4e99719ae3f275a0b511e
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Jul 28 22:16:45 2016 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 02:00:15 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f978cfd5
dev-db/sqlite: Delete old patches.
...all-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch | 443 ---------------------
...all-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch | 232 -----------
.../sqlite-3.11.0-nonfull_tarball-build.patch | 38 --
3 files changed, 713 deletions(-)
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
deleted file mode 100644
index 9aaf244..0000000
--- a/dev-db/sqlite/files/sqlite-3.11.0-full_tarball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch
+++ /dev/null
@@ -1,443 +0,0 @@
-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-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
deleted file mode 100644
index 0ed2517..0000000
--- a/dev-db/sqlite/files/sqlite-3.11.0-nonfull_tarball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch
+++ /dev/null
@@ -1,232 +0,0 @@
-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
deleted file mode 100644
index e0b477c..0000000
--- a/dev-db/sqlite/files/sqlite-3.11.0-nonfull_tarball-build.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlite/files/
@ 2018-04-30 15:58 Mike Gilbert
0 siblings, 0 replies; 8+ messages in thread
From: Mike Gilbert @ 2018-04-30 15:58 UTC (permalink / raw
To: gentoo-commits
commit: 21b024cfc0d3b573f6cae50b1ac047eddcbc09aa
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Mon Apr 30 13:41:36 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Apr 30 15:39:46 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21b024cf
dev-db/sqlite: Fix test fts3expr4-1.8 with C / POSIX locale (LC_MESSAGES).
Closes: https://bugs.gentoo.org/610666
.../files/sqlite-3.23.1-full_archive-tests.patch | 197 +++++++++++++++++++++
1 file changed, 197 insertions(+)
diff --git a/dev-db/sqlite/files/sqlite-3.23.1-full_archive-tests.patch b/dev-db/sqlite/files/sqlite-3.23.1-full_archive-tests.patch
index 7237fbfc0f3..ef813f67e74 100644
--- a/dev-db/sqlite/files/sqlite-3.23.1-full_archive-tests.patch
+++ b/dev-db/sqlite/files/sqlite-3.23.1-full_archive-tests.patch
@@ -1,5 +1,202 @@
https://sqlite.org/src/info/893e6089c875e947
+https://sqlite.org/src/info/576a8f69ae25883f
+https://sqlite.org/src/info/de508e831a43f02c
+--- /ext/fts3/fts3.c
++++ /ext/fts3/fts3.c
+@@ -3963,7 +3963,7 @@
+
+ #ifdef SQLITE_TEST
+ if( rc==SQLITE_OK ){
+- rc = sqlite3Fts3ExprInitTestInterface(db);
++ rc = sqlite3Fts3ExprInitTestInterface(db, pHash);
+ }
+ #endif
+
+--- /ext/fts3/fts3Int.h
++++ /ext/fts3/fts3Int.h
+@@ -584,7 +584,7 @@
+ );
+ void sqlite3Fts3ExprFree(Fts3Expr *);
+ #ifdef SQLITE_TEST
+-int sqlite3Fts3ExprInitTestInterface(sqlite3 *db);
++int sqlite3Fts3ExprInitTestInterface(sqlite3 *db, Fts3Hash*);
+ int sqlite3Fts3InitTerm(sqlite3 *db);
+ #endif
+
+--- /ext/fts3/fts3_expr.c
++++ /ext/fts3/fts3_expr.c
+@@ -1109,34 +1109,6 @@
+ #include <stdio.h>
+
+ /*
+-** Function to query the hash-table of tokenizers (see README.tokenizers).
+-*/
+-static int queryTestTokenizer(
+- sqlite3 *db,
+- const char *zName,
+- const sqlite3_tokenizer_module **pp
+-){
+- int rc;
+- sqlite3_stmt *pStmt;
+- const char zSql[] = "SELECT fts3_tokenizer(?)";
+-
+- *pp = 0;
+- rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0);
+- if( rc!=SQLITE_OK ){
+- return rc;
+- }
+-
+- sqlite3_bind_text(pStmt, 1, zName, -1, SQLITE_STATIC);
+- if( SQLITE_ROW==sqlite3_step(pStmt) ){
+- if( sqlite3_column_type(pStmt, 0)==SQLITE_BLOB ){
+- memcpy((void *)pp, sqlite3_column_blob(pStmt, 0), sizeof(*pp));
+- }
+- }
+-
+- return sqlite3_finalize(pStmt);
+-}
+-
+-/*
+ ** Return a pointer to a buffer containing a text representation of the
+ ** expression passed as the first argument. The buffer is obtained from
+ ** sqlite3_malloc(). It is the responsibility of the caller to use
+@@ -1203,12 +1175,12 @@
+ **
+ ** SELECT fts3_exprtest('simple', 'Bill col2:Bloggs', 'col1', 'col2');
+ */
+-static void fts3ExprTest(
++static void fts3ExprTestCommon(
++ int bRebalance,
+ sqlite3_context *context,
+ int argc,
+ sqlite3_value **argv
+ ){
+- sqlite3_tokenizer_module const *pModule = 0;
+ sqlite3_tokenizer *pTokenizer = 0;
+ int rc;
+ char **azCol = 0;
+@@ -1218,7 +1190,9 @@
+ int ii;
+ Fts3Expr *pExpr;
+ char *zBuf = 0;
+- sqlite3 *db = sqlite3_context_db_handle(context);
++ Fts3Hash *pHash = (Fts3Hash*)sqlite3_user_data(context);
++ const char *zTokenizer = 0;
++ char *zErr = 0;
+
+ if( argc<3 ){
+ sqlite3_result_error(context,
+@@ -1227,23 +1201,17 @@
+ return;
+ }
+
+- rc = queryTestTokenizer(db,
+- (const char *)sqlite3_value_text(argv[0]), &pModule);
+- if( rc==SQLITE_NOMEM ){
+- sqlite3_result_error_nomem(context);
+- goto exprtest_out;
+- }else if( !pModule ){
+- sqlite3_result_error(context, "No such tokenizer module", -1);
+- goto exprtest_out;
+- }
+-
+- rc = pModule->xCreate(0, 0, &pTokenizer);
+- assert( rc==SQLITE_NOMEM || rc==SQLITE_OK );
+- if( rc==SQLITE_NOMEM ){
+- sqlite3_result_error_nomem(context);
+- goto exprtest_out;
++ zTokenizer = (const char*)sqlite3_value_text(argv[0]);
++ rc = sqlite3Fts3InitTokenizer(pHash, zTokenizer, &pTokenizer, &zErr);
++ if( rc!=SQLITE_OK ){
++ if( rc==SQLITE_NOMEM ){
++ sqlite3_result_error_nomem(context);
++ }else{
++ sqlite3_result_error(context, zErr, -1);
++ }
++ sqlite3_free(zErr);
++ return;
+ }
+- pTokenizer->pModule = pModule;
+
+ zExpr = (const char *)sqlite3_value_text(argv[1]);
+ nExpr = sqlite3_value_bytes(argv[1]);
+@@ -1257,7 +1225,7 @@
+ azCol[ii] = (char *)sqlite3_value_text(argv[ii+2]);
+ }
+
+- if( sqlite3_user_data(context) ){
++ if( bRebalance ){
+ char *zDummy = 0;
+ rc = sqlite3Fts3ExprParse(
+ pTokenizer, 0, azCol, 0, nCol, nCol, zExpr, nExpr, &pExpr, &zDummy
+@@ -1283,23 +1251,38 @@
+ sqlite3Fts3ExprFree(pExpr);
+
+ exprtest_out:
+- if( pModule && pTokenizer ){
+- rc = pModule->xDestroy(pTokenizer);
++ if( pTokenizer ){
++ rc = pTokenizer->pModule->xDestroy(pTokenizer);
+ }
+ sqlite3_free(azCol);
+ }
+
++static void fts3ExprTest(
++ sqlite3_context *context,
++ int argc,
++ sqlite3_value **argv
++){
++ fts3ExprTestCommon(0, context, argc, argv);
++}
++static void fts3ExprTestRebalance(
++ sqlite3_context *context,
++ int argc,
++ sqlite3_value **argv
++){
++ fts3ExprTestCommon(1, context, argc, argv);
++}
++
+ /*
+ ** Register the query expression parser test function fts3_exprtest()
+ ** with database connection db.
+ */
+-int sqlite3Fts3ExprInitTestInterface(sqlite3* db){
++int sqlite3Fts3ExprInitTestInterface(sqlite3 *db, Fts3Hash *pHash){
+ int rc = sqlite3_create_function(
+- db, "fts3_exprtest", -1, SQLITE_UTF8, 0, fts3ExprTest, 0, 0
++ db, "fts3_exprtest", -1, SQLITE_UTF8, (void*)pHash, fts3ExprTest, 0, 0
+ );
+ if( rc==SQLITE_OK ){
+ rc = sqlite3_create_function(db, "fts3_exprtest_rebalance",
+- -1, SQLITE_UTF8, (void *)1, fts3ExprTest, 0, 0
++ -1, SQLITE_UTF8, (void*)pHash, fts3ExprTestRebalance, 0, 0
+ );
+ }
+ return rc;
+--- /test/fts3expr.test
++++ /test/fts3expr.test
+@@ -409,7 +409,7 @@
+ } {1 {Usage: fts3_exprtest(tokenizer, expr, col1, ...}}
+ do_test fts3expr-5.2 {
+ catchsql { SELECT fts3_exprtest('doesnotexist', 'a b', 'c') }
+-} {1 {No such tokenizer module}}
++} {1 {unknown tokenizer: doesnotexist}}
+ do_test fts3expr-5.3 {
+ catchsql { SELECT fts3_exprtest('simple', 'a b OR', 'c') }
+ } {1 {Error parsing expression}}
+--- /test/fts3expr4.test
++++ /test/fts3expr4.test
+@@ -29,7 +29,8 @@
+ }
+
+ proc do_icu_expr_test {tn expr res} {
+- uplevel [list do_test $tn [list test_fts3expr icu $expr] [list {*}$res]]
++ set res2 [list {*}$res]
++ uplevel [list do_test $tn [list test_fts3expr "icu en_US" $expr] $res2]
+ }
+
+ proc do_simple_expr_test {tn expr res} {
--- /test/zipfile2.test
+++ /test/zipfile2.test
@@ -52,17 +52,15 @@
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlite/files/
@ 2018-05-27 16:11 Aaron Bauman
0 siblings, 0 replies; 8+ messages in thread
From: Aaron Bauman @ 2018-05-27 16:11 UTC (permalink / raw
To: gentoo-commits
commit: 60f72f89b59cf3eff1f589e9731f1d39f68443b3
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun May 27 11:54:37 2018 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun May 27 16:09:12 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60f72f89
dev-db/sqlite: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/8606
.../sqlite-3.16.0-nonfull_tarball-build.patch | 14 -
.../files/sqlite-3.20.0-full_tarball-build.patch | 158 --------
...ite-3.20.1-full_tarball-csv-unsigned_char.patch | 33 --
...lite-3.20.1-full_tarball-tests-big-endian.patch | 95 -----
.../files/sqlite-3.21.0-full_archive-build.patch | 153 --------
.../files/sqlite-3.22.0-full_archive-build.patch | 405 ---------------------
| 15 -
.../files/sqlite-3.22.0-full_archive-tests.patch | 249 -------------
8 files changed, 1122 deletions(-)
diff --git a/dev-db/sqlite/files/sqlite-3.16.0-nonfull_tarball-build.patch b/dev-db/sqlite/files/sqlite-3.16.0-nonfull_tarball-build.patch
deleted file mode 100644
index 81ef29d8a5d..00000000000
--- a/dev-db/sqlite/files/sqlite-3.16.0-nonfull_tarball-build.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix building with dlopen() not available.
-
---- configure.ac
-+++ configure.ac
-@@ -102,6 +102,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/files/sqlite-3.20.0-full_tarball-build.patch b/dev-db/sqlite/files/sqlite-3.20.0-full_tarball-build.patch
deleted file mode 100644
index cc95be3ee60..00000000000
--- a/dev-db/sqlite/files/sqlite-3.20.0-full_tarball-build.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-Link executables against libsqlite3.so.
-Increase timeout for fuzzcheck.
-Fix building with dlopen() not available.
-
---- Makefile.in
-+++ Makefile.in
-@@ -565,6 +565,7 @@
- #
- SHELL_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS4
- # SHELL_OPT += -DSQLITE_ENABLE_FTS5
-+SHELL_OPT += -DSQLITE_ENABLE_DBSTAT_VTAB
- SHELL_OPT += -DSQLITE_ENABLE_EXPLAIN_COMMENTS
- SHELL_OPT += -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
- SHELL_OPT += -DSQLITE_ENABLE_STMTVTAB
-@@ -591,25 +592,25 @@
-
- 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.lo sqlite3.h
-- $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.lo $(TLIBS)
-+sqldiff$(TEXE): $(TOP)/tool/sqldiff.c libsqlite3.la
-+ $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c libsqlite3.la
-
--dbhash$(TEXE): $(TOP)/tool/dbhash.c sqlite3.lo sqlite3.h
-- $(LTLINK) -o $@ $(TOP)/tool/dbhash.c sqlite3.lo $(TLIBS)
-+dbhash$(TEXE): $(TOP)/tool/dbhash.c libsqlite3.la
-+ $(LTLINK) -o $@ $(TOP)/tool/dbhash.c libsqlite3.la
-
--scrub$(TEXE): $(TOP)/ext/misc/scrub.c sqlite3.lo
-+scrub$(TEXE): $(TOP)/ext/misc/scrub.c libsqlite3.la
- $(LTLINK) -o $@ -I. -DSCRUB_STANDALONE \
-- $(TOP)/ext/misc/scrub.c sqlite3.lo $(TLIBS)
-+ $(TOP)/ext/misc/scrub.c libsqlite3.la
-
- srcck1$(BEXE): $(TOP)/tool/srcck1.c
- $(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c
-@@ -685,7 +686,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
- #
-@@ -1115,13 +1116,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)
-
- # The veryquick.test TCL tests.
- #
-@@ -1151,36 +1152,35 @@
- 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)
-
--dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c sqlite3.lo
-+dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c libsqlite3.la
- $(LTLINK) -DDBDUMP_STANDALONE -o $@ \
-- $(TOP)/ext/misc/dbdump.c sqlite3.lo $(TLIBS)
-+ $(TOP)/ext/misc/dbdump.c libsqlite3.la
-
--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
-
--changeset$(TEXE): $(TOP)/ext/session/changeset.c sqlite3.lo
-- $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c sqlite3.lo $(TLIBS)
-+changeset$(TEXE): $(TOP)/ext/session/changeset.c libsqlite3.la
-+ $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c libsqlite3.la
-
- rollback-test$(TEXE): $(TOP)/tool/rollback-test.c sqlite3.lo
- $(LTLINK) -o $@ $(TOP)/tool/rollback-test.c sqlite3.lo $(TLIBS)
-@@ -1199,11 +1199,11 @@
- kvtest$(TEXE): $(TOP)/test/kvtest.c sqlite3.c
- $(LTLINK) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(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)
-+loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
-+ $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@
-
- # This target will fail if the SQLite amalgamation contains any exported
- # symbols that do not begin with "sqlite3_". It is run as part of the
---- configure.ac
-+++ configure.ac
-@@ -584,6 +584,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.20.1-full_tarball-csv-unsigned_char.patch b/dev-db/sqlite/files/sqlite-3.20.1-full_tarball-csv-unsigned_char.patch
deleted file mode 100644
index 86236c4b4bf..00000000000
--- a/dev-db/sqlite/files/sqlite-3.20.1-full_tarball-csv-unsigned_char.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://sqlite.org/src/info/42f0777555675875
-
---- ext/misc/csv.c
-+++ ext/misc/csv.c
-@@ -78,7 +78,7 @@
- int nAlloc; /* Space allocated for z[] */
- int nLine; /* Current line number */
- int bNotFirst; /* True if prior text has been seen */
-- char cTerm; /* Character that terminated the most recent field */
-+ int cTerm; /* Character that terminated the most recent field */
- size_t iIn; /* Next unread character in the input buffer */
- size_t nIn; /* Number of characters in the input buffer */
- char *zIn; /* The input buffer */
-@@ -166,7 +166,7 @@
- if( p->in!=0 ) return csv_getc_refill(p);
- return EOF;
- }
-- return p->zIn[p->iIn++];
-+ return ((unsigned char*)p->zIn)[p->iIn++];
- }
-
- /* Increase the size of p->z and append character c to the end.
---- test/releasetest.tcl
-+++ test/releasetest.tcl
-@@ -114,7 +114,7 @@
- }
- "Debug-One" {
- --disable-shared
-- -O2
-+ -O2 -funsigned-char
- -DSQLITE_DEBUG=1
- -DSQLITE_MEMDEBUG=1
- -DSQLITE_MUTEX_NOOP=1
diff --git a/dev-db/sqlite/files/sqlite-3.20.1-full_tarball-tests-big-endian.patch b/dev-db/sqlite/files/sqlite-3.20.1-full_tarball-tests-big-endian.patch
deleted file mode 100644
index 427021d2f7b..00000000000
--- a/dev-db/sqlite/files/sqlite-3.20.1-full_tarball-tests-big-endian.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-https://www.sqlite.org/src/info/87ccdf9cbb928455
-
---- test/fts3conf.test
-+++ test/fts3conf.test
-@@ -136,47 +136,49 @@
- do_execsql_test 2.2.3 { SELECT * FROM t1 } {{a b c} {a b c}}
- fts3_integrity 2.2.4 db t1
-
--do_execsql_test 3.1 {
-- CREATE VIRTUAL TABLE t3 USING fts4;
-- REPLACE INTO t3(docid, content) VALUES (1, 'one two');
-- SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'one'
--} {X'0100000002000000'}
--
--do_execsql_test 3.2 {
-- REPLACE INTO t3(docid, content) VALUES (2, 'one two three four');
-- SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'four'
--} {X'0200000003000000'}
--
--do_execsql_test 3.3 {
-- REPLACE INTO t3(docid, content) VALUES (1, 'one two three four five six');
-- SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'six'
--} {X'0200000005000000'}
--
--do_execsql_test 3.4 {
-- UPDATE OR REPLACE t3 SET docid = 2 WHERE docid=1;
-- SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'six'
--} {X'0100000006000000'}
--
--do_execsql_test 3.5 {
-- UPDATE OR REPLACE t3 SET docid = 3 WHERE docid=2;
-- SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'six'
--} {X'0100000006000000'}
--
--do_execsql_test 3.6 {
-- REPLACE INTO t3(docid, content) VALUES (3, 'one two');
-- SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'one'
--} {X'0100000002000000'}
--
--do_execsql_test 3.7 {
-- REPLACE INTO t3(docid, content) VALUES (NULL, 'one two three four');
-- REPLACE INTO t3(docid, content) VALUES (NULL, 'one two three four five six');
-- SELECT docid FROM t3;
--} {3 4 5}
--
--do_execsql_test 3.8 {
-- UPDATE OR REPLACE t3 SET docid = 5, content='three four' WHERE docid = 4;
-- SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'one'
--} {X'0200000002000000'}
-+if {$tcl_platform(byteOrder)=="littleEndian"} {
-+ do_execsql_test 3.1 {
-+ CREATE VIRTUAL TABLE t3 USING fts4;
-+ REPLACE INTO t3(docid, content) VALUES (1, 'one two');
-+ SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'one'
-+ } {X'0100000002000000'}
-+
-+ do_execsql_test 3.2 {
-+ REPLACE INTO t3(docid, content) VALUES (2, 'one two three four');
-+ SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'four'
-+ } {X'0200000003000000'}
-+
-+ do_execsql_test 3.3 {
-+ REPLACE INTO t3(docid, content) VALUES (1, 'one two three four five six');
-+ SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'six'
-+ } {X'0200000005000000'}
-+
-+ do_execsql_test 3.4 {
-+ UPDATE OR REPLACE t3 SET docid = 2 WHERE docid=1;
-+ SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'six'
-+ } {X'0100000006000000'}
-+
-+ do_execsql_test 3.5 {
-+ UPDATE OR REPLACE t3 SET docid = 3 WHERE docid=2;
-+ SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'six'
-+ } {X'0100000006000000'}
-+
-+ do_execsql_test 3.6 {
-+ REPLACE INTO t3(docid, content) VALUES (3, 'one two');
-+ SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'one'
-+ } {X'0100000002000000'}
-+
-+ do_execsql_test 3.7 {
-+ REPLACE INTO t3(docid, content) VALUES(NULL,'one two three four');
-+ REPLACE INTO t3(docid, content) VALUES(NULL,'one two three four five six');
-+ SELECT docid FROM t3;
-+ } {3 4 5}
-+
-+ do_execsql_test 3.8 {
-+ UPDATE OR REPLACE t3 SET docid = 5, content='three four' WHERE docid = 4;
-+ SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'one'
-+ } {X'0200000002000000'}
-+}
-
- #-------------------------------------------------------------------------
- # Test that the xSavepoint is invoked correctly if the first write
diff --git a/dev-db/sqlite/files/sqlite-3.21.0-full_archive-build.patch b/dev-db/sqlite/files/sqlite-3.21.0-full_archive-build.patch
deleted file mode 100644
index dfc01c88b56..00000000000
--- a/dev-db/sqlite/files/sqlite-3.21.0-full_archive-build.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-Link executables against libsqlite3.so.
-Increase timeout for fuzzcheck.
-Fix building with dlopen() not available.
-
---- /Makefile.in
-+++ /Makefile.in
-@@ -600,25 +600,25 @@
-
- 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): shell.c sqlite3.c
-- $(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \
-- shell.c sqlite3.c \
-- $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
-+sqlite3$(TEXE): shell.c libsqlite3.la
-+ $(LTLINK) $(READLINE_FLAGS) -o $@ \
-+ shell.c libsqlite3.la \
-+ $(LIBREADLINE)
-
--sqldiff$(TEXE): $(TOP)/tool/sqldiff.c sqlite3.lo sqlite3.h
-- $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.lo $(TLIBS)
-+sqldiff$(TEXE): $(TOP)/tool/sqldiff.c libsqlite3.la
-+ $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c libsqlite3.la
-
--dbhash$(TEXE): $(TOP)/tool/dbhash.c sqlite3.lo sqlite3.h
-- $(LTLINK) -o $@ $(TOP)/tool/dbhash.c sqlite3.lo $(TLIBS)
-+dbhash$(TEXE): $(TOP)/tool/dbhash.c libsqlite3.la
-+ $(LTLINK) -o $@ $(TOP)/tool/dbhash.c libsqlite3.la
-
--scrub$(TEXE): $(TOP)/ext/misc/scrub.c sqlite3.lo
-+scrub$(TEXE): $(TOP)/ext/misc/scrub.c libsqlite3.la
- $(LTLINK) -o $@ -I. -DSCRUB_STANDALONE \
-- $(TOP)/ext/misc/scrub.c sqlite3.lo $(TLIBS)
-+ $(TOP)/ext/misc/scrub.c libsqlite3.la
-
- srcck1$(BEXE): $(TOP)/tool/srcck1.c
- $(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c
-@@ -694,7 +694,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
- #
-@@ -1145,13 +1145,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)
-
- # The veryquick.test TCL tests.
- #
-@@ -1181,30 +1181,30 @@
- smoketest: $(TESTPROGS) fuzzcheck$(TEXE)
- ./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS)
-
--sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in
-+sqlite3_analyzer.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in
- $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in >sqlite3_analyzer.c
-
--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)
-
--dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c sqlite3.lo
-+dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c libsqlite3.la
- $(LTLINK) -DDBDUMP_STANDALONE -o $@ \
-- $(TOP)/ext/misc/dbdump.c sqlite3.lo $(TLIBS)
-+ $(TOP)/ext/misc/dbdump.c libsqlite3.la
-
--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
-
--changeset$(TEXE): $(TOP)/ext/session/changeset.c sqlite3.lo
-- $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c sqlite3.lo $(TLIBS)
-+changeset$(TEXE): $(TOP)/ext/session/changeset.c libsqlite3.la
-+ $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c libsqlite3.la
-
- rollback-test$(TEXE): $(TOP)/tool/rollback-test.c sqlite3.lo
- $(LTLINK) -o $@ $(TOP)/tool/rollback-test.c sqlite3.lo $(TLIBS)
-@@ -1223,11 +1223,11 @@
- kvtest$(TEXE): $(TOP)/test/kvtest.c sqlite3.c
- $(LTLINK) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(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)
-+loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
-+ $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@
-
- # This target will fail if the SQLite amalgamation contains any exported
- # symbols that do not begin with "sqlite3_". It is run as part of the
---- /configure.ac
-+++ /configure.ac
-@@ -584,6 +584,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
---- /tool/sqlite3_analyzer.c.in
-+++ /tool/sqlite3_analyzer.c.in
-@@ -14,7 +14,6 @@
- #define SQLITE_DEFAULT_MEMSTATUS 0
- #define SQLITE_MAX_EXPR_DEPTH 0
- #define SQLITE_OMIT_LOAD_EXTENSION 1
--INCLUDE sqlite3.c
- INCLUDE $ROOT/src/tclsqlite.c
-
- const char *sqlite3_analyzer_init_proc(Tcl_Interp *interp){
diff --git a/dev-db/sqlite/files/sqlite-3.22.0-full_archive-build.patch b/dev-db/sqlite/files/sqlite-3.22.0-full_archive-build.patch
deleted file mode 100644
index 5e1236a4e96..00000000000
--- a/dev-db/sqlite/files/sqlite-3.22.0-full_archive-build.patch
+++ /dev/null
@@ -1,405 +0,0 @@
-Move some code to libsqlite3.so to avoid duplication.
-Link executables against libsqlite3.so.
-Increase timeout for fuzzcheck.
-Fix building with dlopen() not available.
-
---- /Makefile.in
-+++ /Makefile.in
-@@ -307,6 +307,9 @@
- # Source code for extensions
- #
- SRC += \
-+ $(TOP)/ext/expert/sqlite3expert.c \
-+ $(TOP)/ext/expert/sqlite3expert.h
-+SRC += \
- $(TOP)/ext/fts1/fts1.c \
- $(TOP)/ext/fts1/fts1.h \
- $(TOP)/ext/fts1/fts1_hash.c \
-@@ -355,8 +358,11 @@
- $(TOP)/ext/rbu/sqlite3rbu.h \
- $(TOP)/ext/rbu/sqlite3rbu.c
- SRC += \
-+ $(TOP)/ext/misc/appendvfs.c \
- $(TOP)/ext/misc/json1.c \
-- $(TOP)/ext/misc/stmt.c
-+ $(TOP)/ext/misc/sqlar.c \
-+ $(TOP)/ext/misc/stmt.c \
-+ $(TOP)/ext/misc/zipfile.c
-
- # Generated source code files
- #
-@@ -425,7 +431,6 @@
- # Statically linked extensions
- #
- TESTSRC += \
-- $(TOP)/ext/expert/sqlite3expert.c \
- $(TOP)/ext/expert/test_expert.c \
- $(TOP)/ext/misc/amatch.c \
- $(TOP)/ext/misc/carray.c \
-@@ -447,8 +452,7 @@
- $(TOP)/ext/misc/spellfix.c \
- $(TOP)/ext/misc/totype.c \
- $(TOP)/ext/misc/unionvtab.c \
-- $(TOP)/ext/misc/wholenumber.c \
-- $(TOP)/ext/misc/zipfile.c
-+ $(TOP)/ext/misc/wholenumber.c
-
- # Source code to the library files needed by the test fixture
- #
-@@ -610,25 +614,25 @@
-
- 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): shell.c sqlite3.c
-- $(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \
-- shell.c sqlite3.c \
-- $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
-+sqlite3$(TEXE): shell.c libsqlite3.la
-+ $(LTLINK) $(READLINE_FLAGS) -o $@ \
-+ shell.c libsqlite3.la \
-+ $(LIBREADLINE)
-
--sqldiff$(TEXE): $(TOP)/tool/sqldiff.c sqlite3.lo sqlite3.h
-- $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.lo $(TLIBS)
-+sqldiff$(TEXE): $(TOP)/tool/sqldiff.c libsqlite3.la
-+ $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c libsqlite3.la
-
--dbhash$(TEXE): $(TOP)/tool/dbhash.c sqlite3.lo sqlite3.h
-- $(LTLINK) -o $@ $(TOP)/tool/dbhash.c sqlite3.lo $(TLIBS)
-+dbhash$(TEXE): $(TOP)/tool/dbhash.c libsqlite3.la
-+ $(LTLINK) -o $@ $(TOP)/tool/dbhash.c libsqlite3.la
-
--scrub$(TEXE): $(TOP)/ext/misc/scrub.c sqlite3.lo
-+scrub$(TEXE): $(TOP)/ext/misc/scrub.c libsqlite3.la
- $(LTLINK) -o $@ -I. -DSCRUB_STANDALONE \
-- $(TOP)/ext/misc/scrub.c sqlite3.lo $(TLIBS)
-+ $(TOP)/ext/misc/scrub.c libsqlite3.la
-
- srcck1$(BEXE): $(TOP)/tool/srcck1.c
- $(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c
-@@ -704,7 +708,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
- #
-@@ -995,14 +999,9 @@
- # Source files that go into making shell.c
- SHELL_SRC = \
- $(TOP)/src/shell.c.in \
-- $(TOP)/ext/misc/appendvfs.c \
- $(TOP)/ext/misc/shathree.c \
- $(TOP)/ext/misc/fileio.c \
- $(TOP)/ext/misc/completion.c \
-- $(TOP)/ext/misc/sqlar.c \
-- $(TOP)/ext/expert/sqlite3expert.c \
-- $(TOP)/ext/expert/sqlite3expert.h \
-- $(TOP)/ext/misc/zipfile.c \
- $(TOP)/src/test_windirent.c
-
- shell.c: $(SHELL_SRC) $(TOP)/tool/mkshellc.tcl
-@@ -1161,13 +1160,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)
-
- # The veryquick.test TCL tests.
- #
-@@ -1197,24 +1196,23 @@
- smoketest: $(TESTPROGS) fuzzcheck$(TEXE)
- ./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS)
-
--sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in
-+sqlite3_analyzer.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in
- $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in >sqlite3_analyzer.c
-
--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)
-
--sqltclsh.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/ext/misc/appendvfs.c $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in
-+sqltclsh.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in
- $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in >sqltclsh.c
-
--sqltclsh$(TEXE): sqltclsh.c
-- $(LTLINK) sqltclsh.c -o $@ $(LIBTCL) $(TLIBS)
-+sqltclsh$(TEXE): sqltclsh.c libsqlite3.la
-+ $(LTLINK) sqltclsh.c -o $@ libsqlite3.la $(LIBTCL)
-
--sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c
-- $(LTLINK) $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c -o sqlite3_expert $(TLIBS)
-+sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/expert.c libsqlite3.la
-+ $(LTLINK) $(TOP)/ext/expert/expert.c -o sqlite3_expert libsqlite3.la
-
- CHECKER_DEPS =\
- $(TOP)/tool/mkccode.tcl \
-- sqlite3.c \
- $(TOP)/src/tclsqlite.c \
- $(TOP)/ext/repair/sqlite3_checker.tcl \
- $(TOP)/ext/repair/checkindex.c \
-@@ -1225,30 +1223,30 @@
- sqlite3_checker.c: $(CHECKER_DEPS)
- $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/ext/repair/sqlite3_checker.c.in >$@
-
--sqlite3_checker$(TEXE): sqlite3_checker.c
-- $(LTLINK) sqlite3_checker.c -o $@ $(LIBTCL) $(TLIBS)
-+sqlite3_checker$(TEXE): sqlite3_checker.c libsqlite3.la
-+ $(LTLINK) sqlite3_checker.c -o $@ libsqlite3.la $(LIBTCL)
-
--dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c sqlite3.lo
-+dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c libsqlite3.la
- $(LTLINK) -DDBDUMP_STANDALONE -o $@ \
-- $(TOP)/ext/misc/dbdump.c sqlite3.lo $(TLIBS)
-+ $(TOP)/ext/misc/dbdump.c libsqlite3.la
-
--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
-
- showshm$(TEXE): $(TOP)/tool/showshm.c
- $(LTLINK) -o $@ $(TOP)/tool/showshm.c
-
--changeset$(TEXE): $(TOP)/ext/session/changeset.c sqlite3.lo
-- $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c sqlite3.lo $(TLIBS)
-+changeset$(TEXE): $(TOP)/ext/session/changeset.c libsqlite3.la
-+ $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c libsqlite3.la
-
- rollback-test$(TEXE): $(TOP)/tool/rollback-test.c sqlite3.lo
- $(LTLINK) -o $@ $(TOP)/tool/rollback-test.c sqlite3.lo $(TLIBS)
-@@ -1267,11 +1265,11 @@
- kvtest$(TEXE): $(TOP)/test/kvtest.c sqlite3.c
- $(LTLINK) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(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)
-+loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
-+ $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@
-
- # This target will fail if the SQLite amalgamation contains any exported
- # symbols that do not begin with "sqlite3_". It is run as part of the
---- /configure.ac
-+++ /configure.ac
-@@ -590,6 +590,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
---- /ext/misc/sqlar.c
-+++ /ext/misc/sqlar.c
-@@ -14,6 +14,8 @@
- ** for working with sqlar archives and used by the shell tool's built-in
- ** sqlar support.
- */
-+#ifdef SQLITE_HAVE_ZLIB
-+
- #include "sqlite3ext.h"
- SQLITE_EXTENSION_INIT1
- #include <zlib.h>
-@@ -119,3 +121,5 @@
- }
- return rc;
- }
-+
-+#endif /* SQLITE_HAVE_ZLIB */
---- /ext/misc/zipfile.c
-+++ /ext/misc/zipfile.c
-@@ -24,6 +24,8 @@
- ** * No support for zip64 extensions
- ** * Only the "inflate/deflate" (zlib) compression method is supported
- */
-+#ifdef SQLITE_HAVE_ZLIB
-+
- #include "sqlite3ext.h"
- SQLITE_EXTENSION_INIT1
- #include <stdio.h>
-@@ -1665,3 +1667,5 @@
- (void)pzErrMsg; /* Unused parameter */
- return zipfileRegister(db);
- }
-+
-+#endif /* SQLITE_HAVE_ZLIB */
---- /ext/repair/sqlite3_checker.c.in
-+++ /ext/repair/sqlite3_checker.c.in
-@@ -2,6 +2,7 @@
- ** Read an SQLite database file and analyze its space utilization. Generate
- ** text on standard output.
- */
-+#define SQLITE_CORE 1
- #define TCLSH_INIT_PROC sqlite3_checker_init_proc
- #define SQLITE_ENABLE_DBPAGE_VTAB 1
- #define SQLITE_ENABLE_JSON1 1
-@@ -14,7 +15,7 @@
- #define SQLITE_OMIT_SHARED_CACHE 1
- #define SQLITE_DEFAULT_MEMSTATUS 0
- #define SQLITE_MAX_EXPR_DEPTH 0
--INCLUDE sqlite3.c
-+#include "sqlite3.h"
- INCLUDE $ROOT/src/tclsqlite.c
- INCLUDE $ROOT/ext/misc/btreeinfo.c
- INCLUDE $ROOT/ext/repair/checkindex.c
---- /src/shell.c.in
-+++ /src/shell.c.in
-@@ -61,6 +61,7 @@
- #include <stdio.h>
- #include <assert.h>
- #include "sqlite3.h"
-+#include "ext/expert/sqlite3expert.h"
- typedef sqlite3_int64 i64;
- typedef sqlite3_uint64 u64;
- typedef unsigned char u8;
-@@ -124,6 +125,10 @@
- # define SHELL_USE_LOCAL_GETLINE 1
- #endif
-
-+#ifdef SQLITE_HAVE_ZLIB
-+#include <zlib.h>
-+#endif
-+
-
- #if defined(_WIN32) || defined(WIN32)
- # include <io.h>
-@@ -963,13 +968,6 @@
- INCLUDE ../ext/misc/shathree.c
- INCLUDE ../ext/misc/fileio.c
- INCLUDE ../ext/misc/completion.c
--INCLUDE ../ext/misc/appendvfs.c
--#ifdef SQLITE_HAVE_ZLIB
--INCLUDE ../ext/misc/zipfile.c
--INCLUDE ../ext/misc/sqlar.c
--#endif
--INCLUDE ../ext/expert/sqlite3expert.h
--INCLUDE ../ext/expert/sqlite3expert.c
-
- #if defined(SQLITE_ENABLE_SESSION)
- /*
-@@ -3467,7 +3465,9 @@
- sqlite3_shathree_init(p->db, 0, 0);
- sqlite3_completion_init(p->db, 0, 0);
- #ifdef SQLITE_HAVE_ZLIB
-+ extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *);
- sqlite3_zipfile_init(p->db, 0, 0);
-+ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
- sqlite3_sqlar_init(p->db, 0, 0);
- #endif
- sqlite3_create_function(p->db, "shell_add_schema", 3, SQLITE_UTF8, 0,
-@@ -5316,6 +5316,7 @@
- }
- sqlite3_fileio_init(cmd.db, 0, 0);
- #ifdef SQLITE_HAVE_ZLIB
-+ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
- sqlite3_sqlar_init(cmd.db, 0, 0);
- #endif
- sqlite3_create_function(cmd.db, "shell_putsnl", 1, SQLITE_UTF8, cmd.p,
-@@ -8222,6 +8223,7 @@
- #endif
- }
- data.out = stdout;
-+ extern int sqlite3_appendvfs_init(sqlite3 *, char **, const sqlite3_api_routines *);
- sqlite3_appendvfs_init(0,0,0);
-
- /* Go ahead and open the database file if it already exists. If the
---- /tool/mksqlite3c.tcl
-+++ /tool/mksqlite3c.tcl
-@@ -116,6 +116,7 @@
- rtree.h
- sqlite3session.h
- sqlite3.h
-+ sqlite3expert.h
- sqlite3ext.h
- sqlite3rbu.h
- sqliteicu.h
-@@ -399,6 +400,10 @@
- json1.c
- fts5.c
- stmt.c
-+ appendvfs.c
-+ sqlar.c
-+ sqlite3expert.c
-+ zipfile.c
- } {
- copy_file tsrc/$file
- }
---- /tool/sqlite3_analyzer.c.in
-+++ /tool/sqlite3_analyzer.c.in
-@@ -14,9 +14,6 @@
- #define SQLITE_DEFAULT_MEMSTATUS 0
- #define SQLITE_MAX_EXPR_DEPTH 0
- #define SQLITE_OMIT_LOAD_EXTENSION 1
--#ifndef USE_EXTERNAL_SQLITE
--INCLUDE sqlite3.c
--#endif
- INCLUDE $ROOT/src/tclsqlite.c
-
- const char *sqlite3_analyzer_init_proc(Tcl_Interp *interp){
---- /tool/sqltclsh.c.in
-+++ /tool/sqltclsh.c.in
-@@ -27,19 +27,17 @@
- #define SQLITE_OMIT_SHARED_CACHE 1
- #define SQLITE_DEFAULT_MEMSTATUS 0
- #define SQLITE_MAX_EXPR_DEPTH 0
--INCLUDE sqlite3.c
--INCLUDE $ROOT/ext/misc/appendvfs.c
--#ifdef SQLITE_HAVE_ZLIB
--INCLUDE $ROOT/ext/misc/zipfile.c
--INCLUDE $ROOT/ext/misc/sqlar.c
--#endif
-+#include "sqlite3.h"
- INCLUDE $ROOT/src/tclsqlite.c
-
- const char *sqlite3_tclapp_init_proc(Tcl_Interp *interp){
- (void)interp;
-+ extern int sqlite3_appendvfs_init(sqlite3 *,char **, const sqlite3_api_routines *);
- sqlite3_appendvfs_init(0,0,0);
- #ifdef SQLITE_HAVE_ZLIB
-+ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
- sqlite3_auto_extension((void(*)(void))sqlite3_sqlar_init);
-+ extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *);
- sqlite3_auto_extension((void(*)(void))sqlite3_zipfile_init);
- #endif
-
diff --git a/dev-db/sqlite/files/sqlite-3.22.0-full_archive-headers.patch b/dev-db/sqlite/files/sqlite-3.22.0-full_archive-headers.patch
deleted file mode 100644
index 751f00a62bd..00000000000
--- a/dev-db/sqlite/files/sqlite-3.22.0-full_archive-headers.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://sqlite.org/src/info/6185d190e250faae
-
---- /src/sqlite3ext.h
-+++ /src/sqlite3ext.h
-@@ -563,8 +563,8 @@
- #define sqlite3_value_pointer sqlite3_api->value_pointer
- /* Version 3.22.0 and later */
- #define sqlite3_vtab_nochange sqlite3_api->vtab_nochange
--#define sqlite3_value_nochange sqltie3_api->value_nochange
--#define sqlite3_vtab_collation sqltie3_api->vtab_collation
-+#define sqlite3_value_nochange sqlite3_api->value_nochange
-+#define sqlite3_vtab_collation sqlite3_api->vtab_collation
- #endif /* !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) */
-
- #if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION)
diff --git a/dev-db/sqlite/files/sqlite-3.22.0-full_archive-tests.patch b/dev-db/sqlite/files/sqlite-3.22.0-full_archive-tests.patch
deleted file mode 100644
index a253028b7f4..00000000000
--- a/dev-db/sqlite/files/sqlite-3.22.0-full_archive-tests.patch
+++ /dev/null
@@ -1,249 +0,0 @@
-https://sqlite.org/src/info/e4766cabdf64d8e9
-https://sqlite.org/src/info/d9e59cfb8476e1ec
-https://sqlite.org/src/info/ba0631de60ca38bf
-https://sqlite.org/src/info/b685d3231097fb90
-
---- /test/fts3rank.test
-+++ /test/fts3rank.test
-@@ -14,7 +14,7 @@
-
- set testdir [file dirname $argv0]
- source $testdir/tester.tcl
--set testprefix fts3expr5
-+set testprefix fts3rank
-
- # If SQLITE_ENABLE_FTS3 is defined, omit this file.
- ifcapable !fts3 {
-@@ -56,9 +56,14 @@
- SELECT * FROM t1 ORDER BY rank(x'0000000000000000') DESC, rowid
- } {0 {{one two} one {one two} three {one two} two}}
-
--do_catchsql_test 1.5 {
-- SELECT * FROM t1 ORDER BY rank(x'0100000001000000') DESC, rowid
--} {1 {invalid matchinfo blob passed to function rank()}}
-+if {$tcl_platform(byteOrder)=="littleEndian"} {
-+ do_catchsql_test 1.5le {
-+ SELECT * FROM t1 ORDER BY rank(x'0100000001000000') DESC, rowid
-+ } {1 {invalid matchinfo blob passed to function rank()}}
-+} else {
-+ do_catchsql_test 1.5be {
-+ SELECT * FROM t1 ORDER BY rank(x'0000000100000001') DESC, rowid
-+ } {1 {invalid matchinfo blob passed to function rank()}}
-+}
-
- finish_test
--
---- /test/func6.test
-+++ /test/func6.test
-@@ -33,54 +33,125 @@
- CREATE TABLE t2(x TEXT PRIMARY KEY, y) WITHOUT ROWID;
- INSERT INTO t2(x,y) SELECT a, b FROM t1;
- }
-+
-+# Load the contents of $file from disk and return it encoded as a hex
-+# string.
-+proc loadhex {file} {
-+ set fd [open $file]
-+ fconfigure $fd -translation binary -encoding binary
-+ set data [read $fd]
-+ close $fd
-+ binary encode hex $data
-+}
-+
-+# Each argument is either an integer between 0 and 65535, a text value, or
-+# an empty string representing an SQL NULL. This command builds an SQLite
-+# record containing the values passed as arguments and returns it encoded
-+# as a hex string.
-+proc hexrecord {args} {
-+ set hdr ""
-+ set body ""
-+ foreach x $args {
-+ if {$x==""} {
-+ append hdr 00
-+ } elseif {[string is integer $x]==0} {
-+ set n [string length $x]
-+ append hdr [format %02x [expr $n*2 + 13]]
-+ append body [binary encode hex $x]
-+ } elseif {$x == 0} {
-+ append hdr 08
-+ } elseif {$x == 1} {
-+ append hdr 09
-+ } elseif {$x <= 127} {
-+ append hdr 01
-+ append body [format %02x $x]
-+ } else {
-+ append hdr 02
-+ append body [format %04x $x]
-+ }
-+ }
-+ set res [format %02x [expr 1 + [string length $hdr]/2]]
-+ append res $hdr
-+ append res $body
-+}
-+
-+# Argument $off is an offset into the database image encoded as a hex string
-+# in argument $hexdb. This command returns 0 if the offset contains the hex
-+# $hexrec, or throws an exception otherwise.
-+#
-+proc offset_contains_record {off hexdb hexrec} {
-+ set n [string length $hexrec]
-+ set off [expr $off*2]
-+ if { [string compare $hexrec [string range $hexdb $off [expr $off+$n-1]]] } {
-+ error "record not found!"
-+ }
-+ return 0
-+}
-+
-+# This command is the implementation of SQL function "offrec()". The first
-+# argument to this is an offset value. The remaining values are used to
-+# formulate an SQLite record. If database file test.db does not contain
-+# an equivalent record at the specified offset, an exception is thrown.
-+# Otherwise, 0 is returned.
-+#
-+proc offrec {args} {
-+ set offset [lindex $args 0]
-+ set rec [hexrecord {*}[lrange $args 1 end]]
-+ offset_contains_record $offset $::F $rec
-+}
-+set F [loadhex test.db]
-+db func offrec offrec
-+
-+# Test the sanity of the tests.
-+do_execsql_test func6-105 {
-+ SELECT sqlite_offset(d) FROM t1 ORDER BY rowid LIMIT 1;
-+} {8179}
-+do_test func6-106 {
-+ set r [hexrecord abc001 1 999 {}]
-+ offset_contains_record 8179 $F $r
-+} 0
-+
-+set z100 [string trim [string repeat "0 " 100]]
-+
-+# Test offsets within table b-tree t1.
- do_execsql_test func6-110 {
-- SELECT a, sqlite_offset(d)/4096 + 1,
-- sqlite_offset(d)%4096 FROM t1
-- ORDER BY rowid LIMIT 2;
--} {abc001 2 4084 abc002 2 4069}
-+ SELECT offrec(sqlite_offset(d), a, b, c, d) FROM t1 ORDER BY rowid
-+} $z100
-+
- do_execsql_test func6-120 {
- SELECT a, typeof(sqlite_offset(+a)) FROM t1
- ORDER BY rowid LIMIT 2;
- } {abc001 null abc002 null}
-+
-+# Test offsets within index b-tree t1a.
- do_execsql_test func6-130 {
-- SELECT a, sqlite_offset(a)/4096+1,
-- sqlite_offset(a)%4096
-- FROM t1
-- ORDER BY a LIMIT 2;
--} {abc001 3 4087 abc002 3 4076}
-+ SELECT offrec(sqlite_offset(a), a, rowid) FROM t1 ORDER BY a
-+} $z100
-+
-+# Test offsets within table b-tree t1 with a temp b-tree ORDER BY.
- do_execsql_test func6-140 {
-- SELECT a, sqlite_offset(d)/4096+1,
-- sqlite_offset(d)%4096
-- FROM t1
-- ORDER BY a LIMIT 2;
--} {abc001 2 4084 abc002 2 4069}
-+ SELECT offrec(sqlite_offset(d), a, b, c, d) FROM t1 ORDER BY a
-+} $z100
-+
-+# Test offsets from both index t1a and table t1 in the same query.
- do_execsql_test func6-150 {
-- SELECT a,
-- sqlite_offset(a)/4096+1,
-- sqlite_offset(a)%4096,
-- sqlite_offset(d)/4096+1,
-- sqlite_offset(d)%4096
-- FROM t1
-- ORDER BY a LIMIT 2;
--} {abc001 3 4087 2 4084 abc002 3 4076 2 4069}
--do_execsql_test func6-160 {
-- SELECT b,
-- sqlite_offset(b)/4096+1,
-- sqlite_offset(b)%4096,
-- sqlite_offset(c)/4096+1,
-- sqlite_offset(c)%4096,
-- sqlite_offset(d)/4096+1,
-- sqlite_offset(d)%4096
-- FROM t1
-- ORDER BY b LIMIT 2;
--} {1 4 4090 4 4090 2 4084 2 4 4081 4 4081 2 4069}
-+ SELECT offrec(sqlite_offset(a), a, rowid),
-+ offrec(sqlite_offset(d), a, b, c, d)
-+ FROM t1 ORDER BY a
-+} [concat $z100 $z100]
-
-+# Test offsets from both index t1bc and table t1 in the same query.
-+do_execsql_test func6-160 {
-+ SELECT offrec(sqlite_offset(b), b, c, rowid),
-+ offrec(sqlite_offset(c), b, c, rowid),
-+ offrec(sqlite_offset(d), a, b, c, d)
-+ FROM t1
-+ ORDER BY b
-+} [concat $z100 $z100 $z100]
-
-+# Test offsets in WITHOUT ROWID table t2.
- do_execsql_test func6-200 {
-- SELECT y, sqlite_offset(y)/4096+1,
-- sqlite_offset(y)%4096
-- FROM t2
-- ORDER BY x LIMIT 2;
--} {1 5 4087 2 5 4076}
-+ SELECT offrec( sqlite_offset(y), x, y ) FROM t2 ORDER BY x
-+} $z100
-
- finish_test
---- /test/walro2.test
-+++ /test/walro2.test
-@@ -39,6 +39,18 @@
- }
- }
-
-+# Most systems allocate the *-shm file in 32KB trunks. But on UNIX systems
-+# for which the getpagesize() call returns greater than 32K, the *-shm
-+# file is allocated in page-sized units (since you cannot mmap part of
-+# a page). The following code sets variable $MINSHMSZ to the smallest
-+# possible *-shm file (i.e. the greater of 32KB and the system page-size).
-+#
-+do_execsql_test 0.0 {
-+ PRAGMA journal_mode = wal;
-+ CREATE TABLE t1(x);
-+} {wal}
-+set MINSHMSZ [file size test.db-shm]
-+
- foreach bZeroShm {0 1} {
- set TN [expr $bZeroShm+1]
- do_multiclient_test tn {
-@@ -169,7 +181,7 @@
- } {a b c d e f g h 1 2}
- do_test $TN.3.2.2 {
- list [file size test.db-wal] [file size test.db-shm]
-- } {0 32768}
-+ } [list 0 $MINSHMSZ]
-
- do_test $TN.3.3.0 {
- code2 { sqlite3 db2 test.db }
-@@ -182,7 +194,7 @@
- code2 { db2 close }
- code1 { db close }
- list [file size test.db-wal] [file size test.db-shm]
-- } [list [wal_file_size 4 1024] 32768]
-+ } [list [wal_file_size 4 1024] $MINSHMSZ]
- do_test $TN.3.3.1 {
- code1 { sqlite3 db file:test.db?readonly_shm=1 }
- sql1 { SELECT * FROM t1 }
-@@ -196,7 +208,7 @@
- }
- code2 { db2 close }
- list [file size test.db-wal] [file size test.db-shm]
-- } [list [wal_file_size 4 1024] 32768]
-+ } [list [wal_file_size 4 1024] $MINSHMSZ]
- do_test $TN.3.3.3 {
- sql1 { SELECT * FROM t1 }
- } {i ii}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlite/files/
@ 2022-02-11 0:53 Conrad Kostecki
0 siblings, 0 replies; 8+ messages in thread
From: Conrad Kostecki @ 2022-02-11 0:53 UTC (permalink / raw
To: gentoo-commits
commit: a9b917421e2faa6c642367bd14dd984fb58057c8
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Feb 10 11:40:36 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Feb 11 00:53:10 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9b91742
dev-db/sqlite: remove unused patch(es)
Closes: https://github.com/gentoo/gentoo/pull/24146
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../sqlite-3.37.0-configure-amalgamation.patch | 40 ----------------------
1 file changed, 40 deletions(-)
diff --git a/dev-db/sqlite/files/sqlite-3.37.0-configure-amalgamation.patch b/dev-db/sqlite/files/sqlite-3.37.0-configure-amalgamation.patch
deleted file mode 100644
index 4c7f75ee257f..000000000000
--- a/dev-db/sqlite/files/sqlite-3.37.0-configure-amalgamation.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://sqlite.org/forum/info/3de38a45421e83a17e8ce220bbe2c2d6aff2ecf2e8b0f5173b2116705a53e061
-https://git.pld-linux.org/?p=packages/sqlite3.git;a=blob_plain;f=sqlite3-amalgamation_configure.patch;hb=HEAD
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -116,6 +116,13 @@
- USE_AMALGAMATION=1
-
- #########
-+# By default, amalgamation sqlite3.c will have #line directives.
-+# This is a build option not shown by ./configure --help
-+# To control it, use configure option: amalgamation_line_macros=?
-+# where ? is no to suppress #line directives or yes to create them.
-+AMALGAMATION_LINE_MACROS=--linemacros=0
-+
-+#########
- # See whether we can run specific tclsh versions known to work well;
- # if not, then we fall back to plain tclsh.
- # TODO: try other versions before falling back?
-@@ -574,6 +581,20 @@
- fi
- AC_SUBST(USE_AMALGAMATION)
-
-+########
-+# See whether --disable
-+if test "${amalgamation_line_macros+set}" = set; then :
-+ enableval=$amalgamation_line_macros;
-+fi
-+
-+if test "${amalgamation_line_macros}" = "yes" ; then
-+ AMALGAMATION_LINE_MACROS=--linemacros=1
-+fi
-+if test "${amalgamation_line_macros}" = "no" ; then
-+ AMALGAMATION_LINE_MACROS=--linemacros=0
-+fi
-+AC_SUBST(AMALGAMATION_LINE_MACROS)
-+
- #########
- # Look for zlib. Only needed by extensions and by the sqlite3.exe shell
- AC_CHECK_HEADERS(zlib.h)
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlite/files/
@ 2023-03-23 23:13 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2023-03-23 23:13 UTC (permalink / raw
To: gentoo-commits
commit: 25227e6e5dbc77672a3586312432810c1e2811fe
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 23 23:13:17 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 23 23:13:17 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25227e6e
dev-db/sqlite: add another bug ref for perf patch
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-db/sqlite/files/sqlite-3.41.2-perf-regression.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-db/sqlite/files/sqlite-3.41.2-perf-regression.patch b/dev-db/sqlite/files/sqlite-3.41.2-perf-regression.patch
index 7d8acf6ddda8..0bf5c41513af 100644
--- a/dev-db/sqlite/files/sqlite-3.41.2-perf-regression.patch
+++ b/dev-db/sqlite/files/sqlite-3.41.2-perf-regression.patch
@@ -1,4 +1,4 @@
-https://sqlite.org/forum/forumpost/3a180ba0d4
+https://sqlite.org/forum/forumpost/3a180ba0d4 and https://sqlite.org/forum/forumpost/f9346b11a6
https://sqlite.org/src/info/aa6bd6dff751223e
(-> https://sqlite.org/src/vpatch?from=71215599cd8ebb97&to=aa6bd6dff751223e)
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlite/files/
@ 2023-07-02 1:43 Conrad Kostecki
0 siblings, 0 replies; 8+ messages in thread
From: Conrad Kostecki @ 2023-07-02 1:43 UTC (permalink / raw
To: gentoo-commits
commit: eaa3e3d36f9b2638bd830dc03081aeff20788c2d
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Jun 28 17:49:45 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Jul 2 01:34:14 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaa3e3d3
dev-db/sqlite: remove unused patch(es)
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31658
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/sqlite-3.41.2-perf-regression.patch | 101 ---------------------
1 file changed, 101 deletions(-)
diff --git a/dev-db/sqlite/files/sqlite-3.41.2-perf-regression.patch b/dev-db/sqlite/files/sqlite-3.41.2-perf-regression.patch
deleted file mode 100644
index 0bf5c41513af..000000000000
--- a/dev-db/sqlite/files/sqlite-3.41.2-perf-regression.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-https://sqlite.org/forum/forumpost/3a180ba0d4 and https://sqlite.org/forum/forumpost/f9346b11a6
-https://sqlite.org/src/info/aa6bd6dff751223e
-(-> https://sqlite.org/src/vpatch?from=71215599cd8ebb97&to=aa6bd6dff751223e)
-
---- a/src/select.c
-+++ b/src/select.c
-@@ -4236,12 +4236,11 @@
- ** (17f) the subquery must not be the RHS of a LEFT JOIN.
- ** (17g) either the subquery is the first element of the outer
- ** query or there are no RIGHT or FULL JOINs in any arm
- ** of the subquery. (This is a duplicate of condition (27b).)
- ** (17h) The corresponding result set expressions in all arms of the
--** compound must have the same affinity. (See restriction (9)
--** on the push-down optimization.)
-+** compound must have the same affinity.
- **
- ** The parent and sub-query may contain WHERE clauses. Subject to
- ** rules (11), (13) and (14), they may also contain ORDER BY,
- ** LIMIT and OFFSET clauses. The subquery cannot use any compound
- ** operator other than UNION ALL because all the other compound
-@@ -5105,14 +5104,10 @@
- **
- ** (8) If the subquery is a compound that uses UNION, INTERSECT,
- ** or EXCEPT, then all of the result set columns for all arms of
- ** the compound must use the BINARY collating sequence.
- **
--** (9) If the subquery is a compound, then all arms of the compound must
--** have the same affinity. (This is the same as restriction (17h)
--** for query flattening.)
--**
- **
- ** Return 0 if no changes are made and non-zero if one or more WHERE clause
- ** terms are duplicated into the subquery.
- */
- static int pushDownWhereTerms(
-@@ -5139,13 +5134,10 @@
- }
- #ifndef SQLITE_OMIT_WINDOWFUNC
- if( pSel->pWin ) return 0; /* restriction (6b) */
- #endif
- }
-- if( compoundHasDifferentAffinities(pSubq) ){
-- return 0; /* restriction (9) */
-- }
- if( notUnionAll ){
- /* If any of the compound arms are connected using UNION, INTERSECT,
- ** or EXCEPT, then we must ensure that none of the columns use a
- ** non-BINARY collating sequence. */
- for(pSel=pSubq; pSel; pSel=pSel->pPrior){
-
---- a/test/pushdown.test
-+++ b/test/pushdown.test
-@@ -120,7 +120,47 @@
- SELECT v1.a, v1.b, t0.c0 AS cd FROM t0 LEFT JOIN v0 ON v0.c0!=0, v1
- ) WHERE a=2 AND b=0 AND cd=0;
- } {
- 2 0 0
- }
--
-+
-+# 2023-02-22 https://sqlite.org/forum/forumpost/bcc4375032
-+# Performance regression caused by check-in [1ad41840c5e0fa70] from 2022-11-25.
-+# That check-in added a new restriction on push-down. The new restriction is
-+# no longer necessary after check-in [27655c9353620aa5] from 2022-12-14.
-+#
-+do_execsql_test 3.5 {
-+ DROP TABLE IF EXISTS t1;
-+ CREATE TABLE t1(a INT, b INT, c TEXT, PRIMARY KEY(a,b)) WITHOUT ROWID;
-+ INSERT INTO t1(a,b,c) VALUES
-+ (1,100,'abc'),
-+ (2,200,'def'),
-+ (3,300,'abc');
-+ DROP TABLE IF EXISTS t2;
-+ CREATE TABLE t2(a INT, b INT, c TEXT, PRIMARY KEY(a,b)) WITHOUT ROWID;
-+ INSERT INTO t2(a,b,c) VALUES
-+ (1,110,'efg'),
-+ (2,200,'hij'),
-+ (3,330,'klm');
-+ CREATE VIEW v3 AS
-+ SELECT a, b, c FROM t1
-+ UNION ALL
-+ SELECT a, b, 'xyz' FROM t2;
-+ SELECT * FROM v3 WHERE a=2 AND b=200;
-+} {2 200 def 2 200 xyz}
-+do_eqp_test 3.6 {
-+ SELECT * FROM v3 WHERE a=2 AND b=200;
-+} {
-+ QUERY PLAN
-+ |--CO-ROUTINE v3
-+ | `--COMPOUND QUERY
-+ | |--LEFT-MOST SUBQUERY
-+ | | `--SEARCH t1 USING PRIMARY KEY (a=? AND b=?)
-+ | `--UNION ALL
-+ | `--SEARCH t2 USING PRIMARY KEY (a=? AND b=?)
-+ `--SCAN v3
-+}
-+# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-+# We want both arms of the compound subquery to use the
-+# primary key.
-+
- finish_test
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlite/files/
@ 2024-06-17 22:36 Conrad Kostecki
0 siblings, 0 replies; 8+ messages in thread
From: Conrad Kostecki @ 2024-06-17 22:36 UTC (permalink / raw
To: gentoo-commits
commit: cc7925a68f74775c6145560192a52097e342eea0
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri May 31 14:07:06 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Jun 17 22:34:56 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc7925a6
dev-db/sqlite: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/sqlite-3.44.2-fts-regression.patch | 125 --------------
.../files/sqlite-3.44.2-tracker-regression.patch | 187 ---------------------
2 files changed, 312 deletions(-)
diff --git a/dev-db/sqlite/files/sqlite-3.44.2-fts-regression.patch b/dev-db/sqlite/files/sqlite-3.44.2-fts-regression.patch
deleted file mode 100644
index 369732f81b38..000000000000
--- a/dev-db/sqlite/files/sqlite-3.44.2-fts-regression.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-https://bugs.gentoo.org/921490
-https://www.sqlite.org/forum/forumpost/d16aeb397d
-
-https://github.com/kovidgoyal/calibre/commit/0a23fabd5b4bff152047ba0cffbc2b67592645d1
-https://github.com/kovidgoyal/calibre/commit/3349979551db05ec0c8754d7ea5a4e57a97f8a0a
-https://github.com/kovidgoyal/calibre/commit/da82b673f09efbe9cdcc1e0900f0a9f04d8de052
---- a/ext/fts5/fts5_aux.c
-+++ b/ext/fts5/fts5_aux.c
-@@ -209,10 +209,18 @@
- rc = fts5CInstIterNext(&p->iter);
- }
- }
-
- if( iPos==p->iRangeEnd ){
-+ if( p->bOpen ){
-+ if( p->iter.iStart>=0 && iPos>=p->iter.iStart ){
-+ fts5HighlightAppend(&rc, p, &p->zIn[p->iOff], iEndOff - p->iOff);
-+ p->iOff = iEndOff;
-+ }
-+ fts5HighlightAppend(&rc, p, p->zClose, -1);
-+ p->bOpen = 0;
-+ }
- fts5HighlightAppend(&rc, p, &p->zIn[p->iOff], iEndOff - p->iOff);
- p->iOff = iEndOff;
- }
-
- return rc;
-
-ADDED ext/fts5/test/fts5tokenizer2.test
-Index: ext/fts5/test/fts5tokenizer2.test
-==================================================================
---- /dev/null
-+++ b/ext/fts5/test/fts5tokenizer2.test
-@@ -0,0 +1,89 @@
-+# 2023 Nov 03
-+#
-+# The author disclaims copyright to this source code. In place of
-+# a legal notice, here is a blessing:
-+#
-+# May you do good and not evil.
-+# May you find forgiveness for yourself and forgive others.
-+# May you share freely, never taking more than you give.
-+#
-+#***********************************************************************
-+#
-+# Tests focusing on the built-in fts5 tokenizers.
-+#
-+
-+source [file join [file dirname [info script]] fts5_common.tcl]
-+set testprefix fts5tokenizer2
-+
-+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
-+ifcapable !fts5 {
-+ finish_test
-+ return
-+}
-+
-+sqlite3_fts5_create_tokenizer db tst get_tst_tokenizer
-+proc get_tst_tokenizer {args} {
-+ return "tst_tokenizer"
-+}
-+proc tst_tokenizer {flags txt} {
-+ set token ""
-+ set lTok [list]
-+
-+ foreach c [split $txt {}] {
-+ if {$token==""} {
-+ append token $c
-+ } else {
-+ set t1 [string is upper $token]
-+ set t2 [string is upper $c]
-+
-+ if {$t1!=$t2} {
-+ lappend lTok $token
-+ set token ""
-+ }
-+ append token $c
-+ }
-+ }
-+ if {$token!=""} { lappend lTok $token }
-+
-+ set iOff 0
-+ foreach t $lTok {
-+ set n [string length $t]
-+ sqlite3_fts5_token $t $iOff [expr $iOff+$n]
-+ incr iOff $n
-+ }
-+}
-+
-+do_execsql_test 1.0 {
-+ CREATE VIRTUAL TABLE t1 USING fts5(t, tokenize=tst);
-+}
-+
-+do_execsql_test 1.1 {
-+ INSERT INTO t1 VALUES('AAdontBBmess');
-+}
-+
-+do_execsql_test 1.2 {
-+ SELECT snippet(t1, 0, '>', '<', '...', 4) FROM t1('BB');
-+} {AAdont>BB<mess}
-+
-+do_execsql_test 1.3 {
-+ SELECT highlight(t1, 0, '>', '<') FROM t1('BB');
-+} {AAdont>BB<mess}
-+
-+do_execsql_test 1.4 {
-+ SELECT highlight(t1, 0, '>', '<') FROM t1('AA');
-+} {>AA<dontBBmess}
-+
-+do_execsql_test 1.5 {
-+ SELECT highlight(t1, 0, '>', '<') FROM t1('dont');
-+} {AA>dont<BBmess}
-+
-+do_execsql_test 1.6 {
-+ SELECT highlight(t1, 0, '>', '<') FROM t1('mess');
-+} {AAdontBB>mess<}
-+
-+do_execsql_test 1.7 {
-+ SELECT highlight(t1, 0, '>', '<') FROM t1('BB mess');
-+} {AAdont>BBmess<}
-+
-+
-+finish_test
-
-
diff --git a/dev-db/sqlite/files/sqlite-3.44.2-tracker-regression.patch b/dev-db/sqlite/files/sqlite-3.44.2-tracker-regression.patch
deleted file mode 100644
index b03848a19147..000000000000
--- a/dev-db/sqlite/files/sqlite-3.44.2-tracker-regression.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-https://sqlite.org/forum/forumpost/cb59d962fd
-https://sqlite.org/src/vinfo/d8c6b246
-https://sqlite.org/src/info/67da596d82ec0ed3 (backport)
-
---- a/ext/fts5/fts5_index.c
-+++ b/ext/fts5/fts5_index.c
-@@ -355,10 +355,11 @@
- int nContentlessDelete; /* Number of contentless delete ops */
- int nPendingRow; /* Number of INSERT in hash table */
-
- /* Error state. */
- int rc; /* Current error code */
-+ int flushRc;
-
- /* State used by the fts5DataXXX() functions. */
- sqlite3_blob *pReader; /* RO incr-blob open on %_data table */
- sqlite3_stmt *pWriter; /* "INSERT ... %_data VALUES(?,?)" */
- sqlite3_stmt *pDeleter; /* "DELETE FROM %_data ... id>=? AND id<=?" */
-@@ -4000,10 +4001,11 @@
- assert( p->pHash || p->nPendingData==0 );
- if( p->pHash ){
- sqlite3Fts5HashClear(p->pHash);
- p->nPendingData = 0;
- p->nPendingRow = 0;
-+ p->flushRc = SQLITE_OK;
- }
- p->nContentlessDelete = 0;
- }
-
- /*
-@@ -5582,18 +5584,24 @@
- /*
- ** Flush any data stored in the in-memory hash tables to the database.
- */
- static void fts5IndexFlush(Fts5Index *p){
- /* Unless it is empty, flush the hash table to disk */
-+ if( p->flushRc ){
-+ p->rc = p->flushRc;
-+ return;
-+ }
- if( p->nPendingData || p->nContentlessDelete ){
- assert( p->pHash );
- fts5FlushOneHash(p);
- if( p->rc==SQLITE_OK ){
- sqlite3Fts5HashClear(p->pHash);
- p->nPendingData = 0;
- p->nPendingRow = 0;
- p->nContentlessDelete = 0;
-+ }else if( p->nPendingData || p->nContentlessDelete ){
-+ p->flushRc = p->rc;
- }
- }
- }
-
- static Fts5Structure *fts5IndexOptimizeStruct(
-
---- a/ext/fts5/fts5_main.c
-+++ b/ext/fts5/fts5_main.c
-@@ -116,11 +116,11 @@
- Fts5Table p; /* Public class members from fts5Int.h */
- Fts5Storage *pStorage; /* Document store */
- Fts5Global *pGlobal; /* Global (connection wide) data */
- Fts5Cursor *pSortCsr; /* Sort data from this cursor */
- int iSavepoint; /* Successful xSavepoint()+1 */
-- int bInSavepoint;
-+
- #ifdef SQLITE_DEBUG
- struct Fts5TransactionState ts;
- #endif
- };
-
-@@ -2613,13 +2613,11 @@
- sqlite3_vtab *pVtab, /* Virtual table handle */
- const char *zName /* New name of table */
- ){
- int rc;
- Fts5FullTable *pTab = (Fts5FullTable*)pVtab;
-- pTab->bInSavepoint = 1;
- rc = sqlite3Fts5StorageRename(pTab->pStorage, zName);
-- pTab->bInSavepoint = 0;
- return rc;
- }
-
- int sqlite3Fts5FlushToDisk(Fts5Table *pTab){
- fts5TripCursors((Fts5FullTable*)pTab);
-@@ -2632,30 +2630,16 @@
- ** Flush the contents of the pending-terms table to disk.
- */
- static int fts5SavepointMethod(sqlite3_vtab *pVtab, int iSavepoint){
- Fts5FullTable *pTab = (Fts5FullTable*)pVtab;
- int rc = SQLITE_OK;
-- char *zSql = 0;
-+
- fts5CheckTransactionState(pTab, FTS5_SAVEPOINT, iSavepoint);
--
-- if( pTab->bInSavepoint==0 ){
-- zSql = sqlite3_mprintf("INSERT INTO %Q.%Q(%Q) VALUES('flush')",
-- pTab->p.pConfig->zDb, pTab->p.pConfig->zName, pTab->p.pConfig->zName
-- );
-- if( zSql ){
-- pTab->bInSavepoint = 1;
-- rc = sqlite3_exec(pTab->p.pConfig->db, zSql, 0, 0, 0);
-- pTab->bInSavepoint = 0;
-- sqlite3_free(zSql);
-- }else{
-- rc = SQLITE_NOMEM;
-- }
-- if( rc==SQLITE_OK ){
-- pTab->iSavepoint = iSavepoint+1;
-- }
-- }
--
-+ rc = sqlite3Fts5FlushToDisk((Fts5Table*)pVtab);
-+ if( rc==SQLITE_OK ){
-+ pTab->iSavepoint = iSavepoint+1;
-+ }
- return rc;
- }
-
- /*
- ** The xRelease() method.
-@@ -2912,11 +2896,11 @@
- /*
- ** Run an integrity check on the FTS5 data structures. Return a string
- ** if anything is found amiss. Return a NULL pointer if everything is
- ** OK.
- */
--static int fts5Integrity(
-+static int fts5IntegrityMethod(
- sqlite3_vtab *pVtab, /* the FTS5 virtual table to check */
- const char *zSchema, /* Name of schema in which this table lives */
- const char *zTabname, /* Name of the table itself */
- int isQuick, /* True if this is a quick-check */
- char **pzErr /* Write error message here */
-@@ -2970,11 +2954,11 @@
- /* xRename */ fts5RenameMethod,
- /* xSavepoint */ fts5SavepointMethod,
- /* xRelease */ fts5ReleaseMethod,
- /* xRollbackTo */ fts5RollbackToMethod,
- /* xShadowName */ fts5ShadowName,
-- /* xIntegrity */ fts5Integrity
-+ /* xIntegrity */ fts5IntegrityMethod
- };
-
- int rc;
- Fts5Global *pGlobal = 0;
-
-
---- a/ext/fts5/test/fts5misc.test
-+++ b/ext/fts5/test/fts5misc.test
-@@ -89,11 +89,10 @@
- CREATE VIRTUAL TABLE vt0 USING fts5(c0);
- BEGIN TRANSACTION;
- INSERT INTO vt0(c0) VALUES ('xyz');
- }
-
--breakpoint
- do_execsql_test 2.2.2 {
- ALTER TABLE t0 RENAME TO t1;
- }
- do_execsql_test 2.2.3 {
- INSERT INTO vt0(vt0) VALUES('integrity-check');
-@@ -498,8 +497,23 @@
- } {assertionfaultproblem}
- do_execsql_test 17.5 {
- SELECT c0 FROM t0 WHERE c0 GLOB '*faul*';
- } {assertionfaultproblem}
-
-+#-------------------------------------------------------------------------
-+reset_db
-+do_execsql_test 18.0 {
-+ BEGIN;
-+ CREATE VIRTUAL TABLE t1 USING fts5(text);
-+ ALTER TABLE t1 RENAME TO t2;
-+}
-+
-+do_execsql_test 18.1 {
-+ DROP TABLE t2;
-+}
-+
-+do_execsql_test 18.2 {
-+ COMMIT;
-+}
-
- finish_test
-
-
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlite/files/
@ 2024-06-27 15:40 Conrad Kostecki
0 siblings, 0 replies; 8+ messages in thread
From: Conrad Kostecki @ 2024-06-27 15:40 UTC (permalink / raw
To: gentoo-commits
commit: 5757c576c81986b58cb553351174c036a3b3d1e4
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Jun 24 17:19:22 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Jun 27 15:40:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5757c576
dev-db/sqlite: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
dev-db/sqlite/files/sqlite-3.45.1-lto.patch | 20 --------------------
1 file changed, 20 deletions(-)
diff --git a/dev-db/sqlite/files/sqlite-3.45.1-lto.patch b/dev-db/sqlite/files/sqlite-3.45.1-lto.patch
deleted file mode 100644
index 3f15d1a29265..000000000000
--- a/dev-db/sqlite/files/sqlite-3.45.1-lto.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# Bug: https://bugs.gentoo.org/924300
-# Taken from https://sqlite.org/src/info/803481f25020f3c
---- a/test/fuzzcheck.c
-+++ b/test/fuzzcheck.c
-@@ -159,12 +159,12 @@
- } g;
-
- /*
- ** Include the external vt02.c and randomjson.c modules.
- */
--extern int sqlite3_vt02_init(sqlite3*,char***,void*);
--extern int sqlite3_randomjson_init(sqlite3*,char***,void*);
-+extern int sqlite3_vt02_init(sqlite3*,char**,const sqlite3_api_routines*);
-+extern int sqlite3_randomjson_init(sqlite3*,char**,const sqlite3_api_routines*);
-
-
- /*
- ** Print an error message and quit.
- */
-
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-06-27 15:40 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-02-11 0:53 [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlite/files/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2024-06-27 15:40 Conrad Kostecki
2024-06-17 22:36 Conrad Kostecki
2023-07-02 1:43 Conrad Kostecki
2023-03-23 23:13 Sam James
2018-05-27 16:11 Aaron Bauman
2018-04-30 15:58 Mike Gilbert
2016-07-29 2:00 Mike Gilbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox