gentoo resync : 18.08.2019

3 files changed, 146 insertions, 51 deletions

diff --git a/dev-db/sqlite/files/sqlite-3.27.2-full_archive-tests.patch b/dev-db/sqlite/files/sqlite-3.27.2-full_archive-tests.patch
deleted file mode 100644
index 92959579b542..000000000000
--- a/dev-db/sqlite/files/sqlite-3.27.2-full_archive-tests.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://sqlite.org/src/info/29d02bf2fa9ecacb
-
---- /ext/session/sessionB.test
-+++ /ext/session/sessionB.test
-@@ -258,8 +258,7 @@
-   INSERT INTO t2 VALUES('a', 'a', 'a', 'a');
- } {
-   DELETE FROM t2 WHERE c = 'a';
--} {
--}
-+} {}
- 
- # INSERT + UPDATE
- do_patchconcat_test 4.3.4 {
---- /test/fts3expr4.test
-+++ /test/fts3expr4.test
-@@ -68,7 +68,7 @@
-   AND {AND {AND {PHRASE 3 0 *} {PHRASE 3 0 lol+}} {PHRASE 3 0 *}} {PHRASE 3 0 h4h+}
- }
- 
--do_simple_expr_test 3.3 { * }    { }
-+do_simple_expr_test 3.3 { * }    {}
- do_simple_expr_test 3.4 { *a }   { PHRASE 3 0 a }
- do_simple_expr_test 3.5 { a*b }  { AND {PHRASE 3 0 a+} {PHRASE 3 0 b} }
- do_simple_expr_test 3.6 { *a*b } { AND {PHRASE 3 0 a+} {PHRASE 3 0 b} }
---- /test/scanstatus.test
-+++ /test/scanstatus.test
-@@ -254,7 +254,7 @@
- }
- 
- do_execsql_test    4.1.1 { INSERT INTO t1 VALUES(1, 2, 3); }
--do_scanstatus_test 4.1.2 { }
-+do_scanstatus_test 4.1.2 {}
- 
- do_execsql_test 4.2 {
-   CREATE TABLE p1(x PRIMARY KEY);
diff --git a/dev-db/sqlite/files/sqlite-3.27.0-full_archive-build.patch b/dev-db/sqlite/files/sqlite-3.29.0-full_archive-build.patch
index 18c6d4d7bd30..290d286e4892 100644
--- a/dev-db/sqlite/files/sqlite-3.27.0-full_archive-build.patch
+++ b/dev-db/sqlite/files/sqlite-3.29.0-full_archive-build.patch
@@ -15,11 +15,12 @@ Fix building with dlopen() not available.
    $(TOP)/ext/fts1/fts1.c \
    $(TOP)/ext/fts1/fts1.h \
    $(TOP)/ext/fts1/fts1_hash.c \
-@@ -363,8 +366,11 @@
+@@ -363,8 +366,12 @@
    $(TOP)/ext/rbu/sqlite3rbu.h \
    $(TOP)/ext/rbu/sqlite3rbu.c
  SRC += \
 +  $(TOP)/ext/misc/appendvfs.c \
++  $(TOP)/ext/misc/dbdata.c \
    $(TOP)/ext/misc/json1.c \
 -  $(TOP)/ext/misc/stmt.c
 +  $(TOP)/ext/misc/sqlar.c \
@@ -28,7 +29,7 @@ Fix building with dlopen() not available.
  
  # Generated source code files
  #
-@@ -434,7 +440,6 @@
+@@ -435,7 +442,6 @@
  # Statically linked extensions
  #
  TESTSRC += \
@@ -36,7 +37,7 @@ Fix building with dlopen() not available.
    $(TOP)/ext/expert/test_expert.c \
    $(TOP)/ext/misc/amatch.c \
    $(TOP)/ext/misc/carray.c \
-@@ -460,7 +465,6 @@
+@@ -461,7 +467,6 @@
    $(TOP)/ext/misc/totype.c \
    $(TOP)/ext/misc/unionvtab.c \
    $(TOP)/ext/misc/wholenumber.c \
@@ -44,7 +45,7 @@ Fix building with dlopen() not available.
    $(TOP)/ext/userauth/userauth.c
  
  # Source code to the library files needed by the test fixture
-@@ -639,25 +643,25 @@
+@@ -640,25 +645,25 @@
  
  libtclsqlite3.la:	tclsqlite.lo libsqlite3.la
  	$(LTLINK) -no-undefined -o $@ tclsqlite.lo \
@@ -81,7 +82,7 @@ Fix building with dlopen() not available.
  
  srcck1$(BEXE):	$(TOP)/tool/srcck1.c
  	$(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c
-@@ -767,7 +771,7 @@
+@@ -768,7 +773,7 @@
  # Rule to build the amalgamation
  #
  sqlite3.lo:	sqlite3.c
@@ -90,7 +91,7 @@ Fix building with dlopen() not available.
  
  # Rules to build the LEMON compiler generator
  #
-@@ -1067,14 +1071,9 @@
+@@ -1065,14 +1070,9 @@
  # Source files that go into making shell.c
  SHELL_SRC = \
  	$(TOP)/src/shell.c.in \
@@ -105,7 +106,7 @@ Fix building with dlopen() not available.
  	$(TOP)/ext/misc/memtrace.c \
          $(TOP)/src/test_windirent.c
  
-@@ -1242,15 +1241,15 @@
+@@ -1240,15 +1240,15 @@
  
  # Fuzz testing
  fuzztest:	fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db
@@ -124,7 +125,7 @@ Fix building with dlopen() not available.
  	valgrind ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
  
  # The veryquick.test TCL tests.
-@@ -1281,24 +1280,23 @@
+@@ -1279,24 +1279,23 @@
  smoketest:	$(TESTPROGS) fuzzcheck$(TEXE)
  	./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS)
  
@@ -157,7 +158,7 @@ Fix building with dlopen() not available.
    $(TOP)/src/tclsqlite.c \
    $(TOP)/ext/repair/sqlite3_checker.tcl \
    $(TOP)/ext/repair/checkindex.c \
-@@ -1309,36 +1307,36 @@
+@@ -1307,36 +1306,36 @@
  sqlite3_checker.c:	$(CHECKER_DEPS)
  	$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/ext/repair/sqlite3_checker.c.in >$@
  
@@ -212,7 +213,7 @@ Fix building with dlopen() not available.
  
  changesetfuzz$(TEXE):	$(TOP)/ext/session/changesetfuzz.c sqlite3.lo
  	$(LTLINK) -o $@ $(TOP)/ext/session/changesetfuzz.c sqlite3.lo $(TLIBS)
-@@ -1363,11 +1361,11 @@
+@@ -1361,11 +1360,11 @@
  kvtest$(TEXE):	$(TOP)/test/kvtest.c sqlite3.c
  	$(LTLINK) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(TLIBS)
  
@@ -314,7 +315,7 @@ Fix building with dlopen() not available.
  
  #if defined(_WIN32) || defined(WIN32)
  # include <io.h>
-@@ -939,14 +944,7 @@
+@@ -939,18 +944,7 @@
  INCLUDE ../ext/misc/shathree.c
  INCLUDE ../ext/misc/fileio.c
  INCLUDE ../ext/misc/completion.c
@@ -326,12 +327,20 @@ Fix building with dlopen() not available.
 -#endif
 -INCLUDE ../ext/expert/sqlite3expert.h
 -INCLUDE ../ext/expert/sqlite3expert.c
+-
+-#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB)
+-INCLUDE ../ext/misc/dbdata.c
+-#endif
  
  #if defined(SQLITE_ENABLE_SESSION)
  /*
-@@ -3934,7 +3932,9 @@
+@@ -4135,10 +4129,13 @@
      sqlite3_shathree_init(p->db, 0, 0);
      sqlite3_completion_init(p->db, 0, 0);
+ #if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB)
++    extern int sqlite3_dbdata_init(sqlite3 *, char **, const sqlite3_api_routines *);
+     sqlite3_dbdata_init(p->db, 0, 0);
+ #endif
  #ifdef SQLITE_HAVE_ZLIB
 +    extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *);
      sqlite3_zipfile_init(p->db, 0, 0);
@@ -339,7 +348,7 @@ Fix building with dlopen() not available.
      sqlite3_sqlar_init(p->db, 0, 0);
  #endif
      sqlite3_create_function(p->db, "shell_add_schema", 3, SQLITE_UTF8, 0,
-@@ -5868,6 +5868,7 @@
+@@ -6135,6 +6132,7 @@
          goto end_ar_command;
        }
        sqlite3_fileio_init(cmd.db, 0, 0);
@@ -347,7 +356,7 @@ Fix building with dlopen() not available.
        sqlite3_sqlar_init(cmd.db, 0, 0);
        sqlite3_create_function(cmd.db, "shell_putsnl", 1, SQLITE_UTF8, cmd.p,
                                shellPutsFunc, 0, 0);
-@@ -9045,6 +9046,7 @@
+@@ -10187,6 +10185,7 @@
  #endif
    }
    data.out = stdout;
@@ -410,11 +419,12 @@ Fix building with dlopen() not available.
     sqlite3ext.h
     sqlite3rbu.h
     sqliteicu.h
-@@ -403,6 +404,10 @@
+@@ -403,6 +404,11 @@
     sqlite3session.c
     fts5.c
     stmt.c
 +   appendvfs.c
++   dbdata.c
 +   sqlar.c
 +   sqlite3expert.c
 +   zipfile.c
diff --git a/dev-db/sqlite/files/sqlite-3.29.0-full_archive-tests.patch b/dev-db/sqlite/files/sqlite-3.29.0-full_archive-tests.patch
new file mode 100644
index 000000000000..3f3779d644e6
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3.29.0-full_archive-tests.patch
@@ -0,0 +1,121 @@
+https://sqlite.org/src/info/408144a1832569ce
+
+--- /test/vtab1.test
++++ /test/vtab1.test
+@@ -1303,25 +1303,27 @@
+   CREATE VIRTUAL TABLE e6 USING echo(t6);
+ }
+ 
+-foreach {tn sql res filter} {
+-  1.1 "SELECT a FROM e6 WHERE b>'8James'" {4 2 6 1 5}
+-    {xFilter {SELECT rowid, a, b FROM 't6' WHERE b > ?} 8James}
+-
+-  1.2 "SELECT a FROM e6 WHERE b>='8' AND b<'9'" {3 4}
+-    {xFilter {SELECT rowid, a, b FROM 't6' WHERE b >= ? AND b < ?} 8 9}
+-
+-  1.3 "SELECT a FROM e6 WHERE b LIKE '8J%'" {3 4}
+-    {xFilter {SELECT rowid, a, b FROM 't6' WHERE b >= ? AND b < ? AND b like ?} 8J 8k 8J%}
+-
+-  1.4 "SELECT a FROM e6 WHERE b LIKE '8j%'" {3 4}
+-    {xFilter {SELECT rowid, a, b FROM 't6' WHERE b >= ? AND b < ? AND b like ?} 8J 8k 8j%}
+-
+-  1.5 "SELECT a FROM e6 WHERE b LIKE '8%'" {3 4}
+-    {xFilter {SELECT rowid, a, b FROM 't6' WHERE b like ?} 8%}
+-} {
+-  set echo_module {}
+-  do_execsql_test 18.$tn.1 $sql $res
+-  do_test         18.$tn.2 { lrange $::echo_module 2 end } $filter
++ifcapable !icu {
++  foreach {tn sql res filter} {
++    1.1 "SELECT a FROM e6 WHERE b>'8James'" {4 2 6 1 5}
++      {xFilter {SELECT rowid, a, b FROM 't6' WHERE b > ?} 8James}
++  
++    1.2 "SELECT a FROM e6 WHERE b>='8' AND b<'9'" {3 4}
++      {xFilter {SELECT rowid, a, b FROM 't6' WHERE b >= ? AND b < ?} 8 9}
++  
++    1.3 "SELECT a FROM e6 WHERE b LIKE '8J%'" {3 4}
++      {xFilter {SELECT rowid, a, b FROM 't6' WHERE b >= ? AND b < ? AND b like ?} 8J 8k 8J%}
++  
++    1.4 "SELECT a FROM e6 WHERE b LIKE '8j%'" {3 4}
++      {xFilter {SELECT rowid, a, b FROM 't6' WHERE b >= ? AND b < ? AND b like ?} 8J 8k 8j%}
++  
++    1.5 "SELECT a FROM e6 WHERE b LIKE '8%'" {3 4}
++      {xFilter {SELECT rowid, a, b FROM 't6' WHERE b like ?} 8%}
++  } {
++    set echo_module {}
++    do_execsql_test 18.$tn.1 $sql $res
++    do_test         18.$tn.2 { lrange $::echo_module 2 end } $filter
++  }
+ }
+ 
+ do_execsql_test 18.2.0 {  PRAGMA case_sensitive_like = ON }
+--- /test/vtabH.test
++++ /test/vtabH.test
+@@ -30,36 +30,38 @@
+   CREATE VIRTUAL TABLE e6 USING echo(t6);
+ }
+ 
+-foreach {tn sql expect} {
+-  1 "SELECT * FROM e6 WHERE b LIKE '8abc'" {
+-    xBestIndex 
+-       {SELECT rowid, a, b FROM 't6' WHERE b >= ? AND b < ? AND b like ?}
+-    xFilter
+-       {SELECT rowid, a, b FROM 't6' WHERE b >= ? AND b < ? AND b like ?}
+-       8ABC 8abd 8abc
++ifcapable !icu {
++  foreach {tn sql expect} {
++    1 "SELECT * FROM e6 WHERE b LIKE '8abc'" {
++      xBestIndex 
++         {SELECT rowid, a, b FROM 't6' WHERE b >= ? AND b < ? AND b like ?}
++      xFilter
++         {SELECT rowid, a, b FROM 't6' WHERE b >= ? AND b < ? AND b like ?}
++         8ABC 8abd 8abc
++    }
++  
++    2 "SELECT * FROM e6 WHERE b GLOB '8abc'" {
++       xBestIndex
++         {SELECT rowid, a, b FROM 't6' WHERE b >= ? AND b < ? AND b glob ?}
++       xFilter
++         {SELECT rowid, a, b FROM 't6' WHERE b >= ? AND b < ? AND b glob ?}
++         8abc 8abd 8abc
++    }
++    3 "SELECT * FROM e6 WHERE b LIKE '8e/'" {
++      xBestIndex {SELECT rowid, a, b FROM 't6' WHERE b like ?}
++      xFilter {SELECT rowid, a, b FROM 't6' WHERE b like ?} 8e/
++    }
++    4 "SELECT * FROM e6 WHERE b GLOB '8e/'" {
++      xBestIndex {SELECT rowid, a, b FROM 't6' WHERE b glob ?}
++      xFilter {SELECT rowid, a, b FROM 't6' WHERE b glob ?} 8e/
++    }
++  } {
++    do_test 1.$tn {
++      set echo_module {}
++      execsql $sql
++      set ::echo_module
++    } [list {*}$expect]
+   }
+-
+-  2 "SELECT * FROM e6 WHERE b GLOB '8abc'" {
+-     xBestIndex
+-       {SELECT rowid, a, b FROM 't6' WHERE b >= ? AND b < ? AND b glob ?}
+-     xFilter
+-       {SELECT rowid, a, b FROM 't6' WHERE b >= ? AND b < ? AND b glob ?}
+-       8abc 8abd 8abc
+-  }
+-  3 "SELECT * FROM e6 WHERE b LIKE '8e/'" {
+-    xBestIndex {SELECT rowid, a, b FROM 't6' WHERE b like ?}
+-    xFilter {SELECT rowid, a, b FROM 't6' WHERE b like ?} 8e/
+-  }
+-  4 "SELECT * FROM e6 WHERE b GLOB '8e/'" {
+-    xBestIndex {SELECT rowid, a, b FROM 't6' WHERE b glob ?}
+-    xFilter {SELECT rowid, a, b FROM 't6' WHERE b glob ?} 8e/
+-  }
+-} {
+-  do_test 1.$tn {
+-    set echo_module {}
+-    execsql $sql
+-    set ::echo_module
+-  } [list {*}$expect]
+ }
+ 
+