summaryrefslogtreecommitdiff
path: root/dev-db/sqlite
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-08-18 18:16:17 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-08-18 18:16:17 +0100
commitfc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch)
tree326613a08f25851c388715e205576a2e7d25dc4f /dev-db/sqlite
parentb24bd25253fe093f722ab576d29fdc41d04cb1ee (diff)
gentoo resync : 18.08.2019
Diffstat (limited to 'dev-db/sqlite')
-rw-r--r--dev-db/sqlite/Manifest16
-rw-r--r--dev-db/sqlite/files/sqlite-3.27.2-full_archive-tests.patch36
-rw-r--r--dev-db/sqlite/files/sqlite-3.29.0-full_archive-build.patch (renamed from dev-db/sqlite/files/sqlite-3.27.0-full_archive-build.patch)40
-rw-r--r--dev-db/sqlite/files/sqlite-3.29.0-full_archive-tests.patch121
-rw-r--r--dev-db/sqlite/metadata.xml4
-rw-r--r--dev-db/sqlite/sqlite-3.28.0.ebuild2
-rw-r--r--dev-db/sqlite/sqlite-3.29.0.ebuild (renamed from dev-db/sqlite/sqlite-3.27.2.ebuild)131
7 files changed, 254 insertions, 96 deletions
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 1d2dd5eab647..f1534a2ee87c 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -1,16 +1,16 @@
AUX sqlite-3.25.0-nonfull_archive-build.patch 416 BLAKE2B 37faa30235c1b668d3cf510c353730a932a807f650c638ac0d07d3a1c0534dedef233c06cef52b6569eb1d58b5bcd910dd59c8d2e792726945f49f882d4181be SHA512 44db89a32b51713cf59fb3f071cca08648deebf6e2830dd61b033a5160ce6ddcbf54a191be42b3b252ea4bc16614fbcfa569207f34f268f1da5acd5fadcda668
-AUX sqlite-3.27.0-full_archive-build.patch 15538 BLAKE2B ee4705bd5ef166437deaaee97b406e0e8775ebea0bcb086c88a07e91451a6cc677e95c47f681c55e7e477a4b84ed5f1520935729bf394146a6c177d5af9caaf8 SHA512 91daf2092608732ab5ad31f8b06b64e67988af846b47d9c9430bc15853e9be12f32d6a10b614f3ce7c009649c0baf710c2c4e03e18b3ae847ea0be8c235129dd
-AUX sqlite-3.27.2-full_archive-tests.patch 964 BLAKE2B 1206311d20be560fb6b6868099c74bea91c210515afa6d727035041231edac67422f61a158411446e7dc7430b221b9a8f581a1f82cf9bc1af63260a6bfe5ab67 SHA512 126863bbe32aa3ffec21651afdf1cd8057fdd441bb176bca481afa73afceb36992067274bea464dd047bf2df542111170ec29a9bfe6104e197969057eb049c6e
AUX sqlite-3.28.0-full_archive-build.patch 15538 BLAKE2B 35b95c237a06c14cb315df044154a2533954b745e045d3038af48803853df46b5d3b075cd702ae5be72ccd291608f4382d254e1e792029f16aa47541009645fc SHA512 f8faa1d582391a6162fb032f2078adcd410736512991acd38ea5b1a735c825109d8608ce753cf2bd6a670871852cec92fc03147050265154c57b1d81bf9427a3
AUX sqlite-3.28.0-full_archive-segmentation_fault_fixes.patch 56920 BLAKE2B f4edd8a213e6aaa2cb87500c1b16b082850f2ddcfd4ab08f559a8c1430f306f954ad1c6b8697fa9c4cdb8c0bbdb760564404816b8544bba16c65f5ae82c6d3c8 SHA512 6fefcf5a4e391db69a0eedbb50a9266d8224743f2fe1a9efa8c7c2e2d5fbe40fa406400b7e71907cc3c961ec58339382e61ec86587494339251727de2e33b3a8
AUX sqlite-3.28.0-full_archive-tests.patch 493 BLAKE2B 53baa103b0abefe0d24431f4372d14bf58f0b69943b41b94c5b506577930deadcd9494c35e5aba1e9e7709d6dbbebad700041655bba2fb84b1208e320db2a5d6 SHA512 2b70fbfd448b287f88e5b2792df3ce9bf728eefd92e06f93f2d33f2392eca0f81bc689e27bead65653d732b025e583f7496044c39e155a8704eb09163253ec46
AUX sqlite-3.28.0-nonfull_archive-segmentation_fault_fixes.patch 3975 BLAKE2B dbdcbec6584c64d662fe0a9a808695e62623844ff08da3e3d38d4027669f84ebb7b757b6e9772d90e12a474dd04b5bdc51efc5d0287a1551f7ba1c37ad7d728b SHA512 0a0c9f748f4bd0e07e743641b58d4068d8f88f9346edf9802cd79ddba47f9dcaf19843677321df78d2912c03e591ee5a72d87391b36f4006f93e00d433f04a78
-DIST sqlite-autoconf-3270200.tar.gz 2797531 BLAKE2B e4d0de32308e519e4f5f68dc0ff1e2098209325ab962a09814aa6af517cb408d1ac70f32fff56cca4ad78bec7d6dedb5b21f222ae391e0fe7e20df5abd37f65a SHA512 0ac2515c7816932a4f725e657122c9f202bd7aba637bad9af5b4592b85efdd10a55ad34ac621b60a7aea91b1021c2ef0924c6ddfe05b2edb4f70e3d34b005972
+AUX sqlite-3.29.0-full_archive-build.patch 15915 BLAKE2B ccc439a441bede4d6b380cae77b97929d342a54f0fc3ee4ac000ca52b1d8d3d63a86e0d9c89dbf3f3a9235ed03ad51c29cbde27a6929e4fe25fb2304977affb9 SHA512 a551bd1c54a7fe7e1581c2682cc0a76f16a00d8513386d85d939ffd1494f29ee266fbe3bc97db74f72435616f30855d14b76dfd4e205c61c5c91c7af3eb97851
+AUX sqlite-3.29.0-full_archive-tests.patch 4122 BLAKE2B e41f62e1efa354c8b5dda6f79328384f0c19f40830e71268e2a3741961248db5c3ca6159deca9bd47983d8ca47ce0caf2fcc8b406cf2f1bc1ff21910fa51d9d6 SHA512 f8cf5f8fc6a53459187cec92823f0982d0d48d9f0b0ab75bcaf713f5486a40193578d187cbc7272371e868b95990a48c794efe300b18a63b9ae273cfcc2f8757
DIST sqlite-autoconf-3280000.tar.gz 2810415 BLAKE2B e1af03476d97f96ef78d4e0a9df6ae69a06fb08e48046c843ed668b3f8c00c58263df07a4e8a22a1c7cfc920fd005fa6c2525dceeec4f724b43df7589ca3f777 SHA512 e800c0d9e6c8c01ccf1d714c6c4da4b98e9610c4c06557dda6393d0792a8ae09788703d4a74dcb21844c49b3629ff7ed95a4a86ff79872aafd2b49c672c7a570
-DIST sqlite-doc-3270200.zip 9371606 BLAKE2B 6d65f59f21eafab82ede6c89d09b8828e5a5e6f7ad7233877fe938773be0aee6fd347d7bba0101cc1d2e376181e4cfbcc2e36d47567b65af9167c4d1ba7f3540 SHA512 00a7c51aeaea2d9338662553c331addca8cd4ae656f4090630b4b2c2e6ceffffd9bd3c6a97117915577cfd6dafeddf9da21f865ab378f86c4832ba0b1c419a2f
+DIST sqlite-autoconf-3290000.tar.gz 2833613 BLAKE2B b68a4f9bfe90653f5ce9dbf94b44cecc843fbb639883a7be9dd40150749f8d2eca0c231b215137d2f8da78d33356d72640a943ba06516c6d7c10ebd04cae4766 SHA512 85dcaa72cc2476c628e801d4ce46cf10ed8997f56cb0334062df5553f18c29d607883a1049bf75258204f2f53a29a02a01f014dcca383b05dfac1e2123778024
DIST sqlite-doc-3280000.zip 9421770 BLAKE2B 695eab96f718307a7aff8a171d9e416ddb4b17039ef7230a458dc7d256e2f07a5b41d3aa1a3f085e5e418c297b5dd1d2ba5e4827434329d1ed61d3dd1f618f3d SHA512 83e23dff00614d31d501c66c29d8d4aa780b38859242b58937243235d185fe3db2f9f3c1accf9bf2df0b457a6e32612a00e82f503a8665aad4f19602e2b36396
-DIST sqlite-src-3270200.zip 12248529 BLAKE2B b3c79b85bbfa376b31ebb4ad33aea3f0b60c1f6d1e6505e02758cffff41e44ea0c5b8c24892f0757502ed6213c0f97f00957632ddf0e5ffe25e9f8b7f62c6e9a SHA512 52f61e2fa54558b953dba62b27961eef8563f40e6b4a62638087cb22c7d1fdf2c915ea1071939e2e98f3ce6041da2c9bfb1bdbc1e8b8b4a049b8148e878a4e5e
+DIST sqlite-doc-3290000.zip 9415641 BLAKE2B 97fef1f01d3e7730e5220541ad9ccdf9f8538aa43939c0f513919c8505b3a4f4b4c89eb2e04fddae80b7eeed440eb0f06f7cfd93cd56f0539bd6fdd5f47e1ff7 SHA512 ca856cf250e395d9c7e9817337adb5a16b1d96a20548a4010f5137188d35bb9d49a4a6da47bf2a696deffa68d2976dbb35a036adce19b8320e0e286876ac094f
DIST sqlite-src-3280000.zip 12477204 BLAKE2B e62e0f36f0bebf89990f8ec91cb1e508a5ebc92bb212eaf9c80eb0febecb5623f5938ecd31c210837314f1f9aab19a18189824f82a106799384d8184ca5f65ab SHA512 49c35c65fa686a2326e13218db583c54fa5fe8f48f0caddd11a942601803b3023f7d32ffbab16641e0d72dc9ed288ad26eaa7226c865ac54e1f181859125651f
-EBUILD sqlite-3.27.2.ebuild 9949 BLAKE2B 2f377a97be15eabca01ba031906aea8a05ad8c19c3b88aa00fa18b3fd8ae875478210471e83b8e670d7ff3da0f8cafd5419810f8e178d49fd79d514b9da3af2f SHA512 8b6bf4e9b9120b7bac35382f6bb4058be193e8295a1d21f18c2d1c6ebbdcbc123f02a398cba01e0100091c760ca0a4137110b66a94993cdbad78c555428654be
-EBUILD sqlite-3.28.0.ebuild 10121 BLAKE2B 40e29e4001dc429cd87e524c9b7db9bcc9baa5aa2ca2b083534450290ae6436d9051b0e89fa5b7a7729fdadda0716f52039055c95016e54717954b33cca46b6d SHA512 47997416d3bb8165a0f355c246a521502d02982e8fe15a2cfbbdefd51628f23450d04774d1c0d17d325091ce48574c71f1fdc0c6fe96278b0de25b37e9bd22cf
-MISC metadata.xml 723 BLAKE2B 8866fbde770e7b8582de27303c72df047db80e0d70b1a1ceca0951a05b51bb704452071ceb6c29ecf3704d523888351615d1798aaab092e6b7505d4c6e3698ad SHA512 40616710b1d4edd3e24b5ac0797c1c9b606aeacac9f9543722bc9529e7c2c704a0c10b0ca68a5ba6e0a0ee8bc605212e8a49a050c8687afbdd7dbf28d6d4506a
+DIST sqlite-src-3290000.zip 12557725 BLAKE2B b1aeb80734a2cb7d45c6f2e278bad2996b56ecaf792a8f26322bf50aeaa430eea267f23edb1721bb80ecb6e0c8e14c7a5d8f26178d056fd23efb52f496cc03e1 SHA512 575398fbe20c6471ee2abcbde170b8d48efbb3cb2716a65f42f05c52429a45d14e8046e50c59bbf75bfe2d8f151c34abd50b440c50af571f19e19f3290b230df
+EBUILD sqlite-3.28.0.ebuild 10089 BLAKE2B 4913c8929b24cbea00d1231b6cf6a6bd0c630ab1cc13577e1e9cc728da80f1f48c11f2a19d754fadc59b33f21dbcb7051b1e5249a536e1c3f94ca6a71a1f2ca2 SHA512 73eb7223d5d6fe6b5b2ee954dd04fcd48d6743ae2cf0a85489437e5183921b46edb39547c865e9f245f2a30a0cb272d26e0419dcef0c3431b15181ebea2b233f
+EBUILD sqlite-3.29.0.ebuild 12045 BLAKE2B 64ccc0e483577de360627a95b1550d8c7d4566d0d78500b3668b16a5bc66a8cb9d5076be5e4961794d04a7427a9a8188837391b39f7c24608fcf33e897871fa9 SHA512 abed3dc42f0ae4f07a9add0c17595eed046bf376458ee37743f6307f13e33f44236adaa6d023e5ad1b772d94885eecd5c98dd2d384e0137bb1915e25c492b0dd
+MISC metadata.xml 606 BLAKE2B 003e4c40dcfdac591df25e197f037d5f8a9b3dca515f71d85f6d5bd91705fd5053f99fcaf4a3e55d9aa827048597f84aba861e3507cf88de571cb7a134a179c5 SHA512 19d616062c139eb0f32379c6f7d69c5ced561f1799785732e51cbd7f8ec2ca600ff724feed4c594ceedd7fc50ea76400fa1563c8fcbe789279cb743f31ae7575
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]
+ }
+
+
diff --git a/dev-db/sqlite/metadata.xml b/dev-db/sqlite/metadata.xml
index ae2540a300e5..271ee2dfe208 100644
--- a/dev-db/sqlite/metadata.xml
+++ b/dev-db/sqlite/metadata.xml
@@ -5,10 +5,6 @@
<email>arfrever.fta@gmail.com</email>
<name>Arfrever Frehtes Taifersar Arahesis</name>
</maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
<use>
<flag name="secure-delete">Enable overwriting of deleted content with zeros by default (http://sqlite.org/pragma.html#pragma_secure_delete), causing some performance penalty</flag>
<flag name="tools">Install additional tools</flag>
diff --git a/dev-db/sqlite/sqlite-3.28.0.ebuild b/dev-db/sqlite/sqlite-3.28.0.ebuild
index 588413694afe..5a3e05325439 100644
--- a/dev-db/sqlite/sqlite-3.28.0.ebuild
+++ b/dev-db/sqlite/sqlite-3.28.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Arfrever Frehtes Taifersar Arahesis and others
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
diff --git a/dev-db/sqlite/sqlite-3.27.2.ebuild b/dev-db/sqlite/sqlite-3.29.0.ebuild
index 39aa0485a829..13490ccf5635 100644
--- a/dev-db/sqlite/sqlite-3.27.2.ebuild
+++ b/dev-db/sqlite/sqlite-3.29.0.ebuild
@@ -1,41 +1,55 @@
-# Copyright 1999-2019 Arfrever Frehtes Taifersar Arahesis and others
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
inherit autotools flag-o-matic multilib-minimal toolchain-funcs
-SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))"
-DOC_PV="${SRC_PV}"
-# DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))"
+if [[ "${PV}" != "9999" ]]; then
+ SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))"
+ DOC_PV="${SRC_PV}"
+ # DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))"
+fi
DESCRIPTION="SQL database engine"
HOMEPAGE="https://sqlite.org/"
-SRC_URI="doc? ( https://sqlite.org/2019/${PN}-doc-${DOC_PV}.zip )
- tcl? ( https://sqlite.org/2019/${PN}-src-${SRC_PV}.zip )
- test? ( https://sqlite.org/2019/${PN}-src-${SRC_PV}.zip )
- tools? ( https://sqlite.org/2019/${PN}-src-${SRC_PV}.zip )
- !tcl? ( !test? ( !tools? ( https://sqlite.org/2019/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )"
+if [[ "${PV}" == "9999" ]]; then
+ SRC_URI=""
+else
+ SRC_URI="doc? ( https://sqlite.org/2019/${PN}-doc-${DOC_PV}.zip )
+ tcl? ( https://sqlite.org/2019/${PN}-src-${SRC_PV}.zip )
+ test? ( https://sqlite.org/2019/${PN}-src-${SRC_PV}.zip )
+ tools? ( https://sqlite.org/2019/${PN}-src-${SRC_PV}.zip )
+ !tcl? ( !test? ( !tools? ( https://sqlite.org/2019/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )"
+fi
LICENSE="public-domain"
SLOT="3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
+if [[ "${PV}" == "9999" ]]; then
+ PROPERTIES="live"
+fi
RESTRICT="!test? ( test )"
-BDEPEND="doc? ( app-arch/unzip )
- tcl? (
- app-arch/unzip
- >=dev-lang/tcl-8.6:0
- )
- test? (
- app-arch/unzip
- >=dev-lang/tcl-8.6:0
- )
- tools? (
- app-arch/unzip
- >=dev-lang/tcl-8.6:0
- )"
+if [[ "${PV}" == "9999" ]]; then
+ BDEPEND=">=dev-lang/tcl-8.6:0
+ dev-vcs/fossil"
+else
+ BDEPEND="doc? ( app-arch/unzip )
+ tcl? (
+ app-arch/unzip
+ >=dev-lang/tcl-8.6:0
+ )
+ test? (
+ app-arch/unzip
+ >=dev-lang/tcl-8.6:0
+ )
+ tools? (
+ app-arch/unzip
+ >=dev-lang/tcl-8.6:0
+ )"
+fi
RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]
icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
@@ -45,21 +59,73 @@ DEPEND="${RDEPEND}
test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )"
full_archive() {
- use tcl || use test || use tools
+ [[ "${PV}" == "9999" ]] || use tcl || use test || use tools
}
pkg_setup() {
- if full_archive; then
- S="${WORKDIR}/${PN}-src-${SRC_PV}"
+ if [[ "${PV}" == "9999" ]]; then
+ S="${WORKDIR}/${PN}"
+ else
+ if full_archive; then
+ S="${WORKDIR}/${PN}-src-${SRC_PV}"
+ else
+ S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
+ fi
+ fi
+}
+
+src_unpack() {
+ if [[ "${PV}" == "9999" ]]; then
+ local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
+ addwrite "${distdir}"
+ mkdir -p "${distdir}/fossil-src/${PN}" || die
+
+ mkdir "${WORKDIR}/${PN}" || die
+ pushd "${WORKDIR}/${PN}" > /dev/null || die
+ if [[ ! -f "${distdir}/fossil-src/${PN}/sqlite.fossil" ]]; then
+ einfo fossil clone --verbose https://sqlite.org/src sqlite.fossil
+ fossil clone --verbose https://sqlite.org/src sqlite.fossil || die
+ echo
+ else
+ cp -p "${distdir}/fossil-src/${PN}/sqlite.fossil" . || die
+ einfo fossil pull --repository sqlite.fossil --verbose https://sqlite.org/src
+ fossil pull --repository sqlite.fossil --verbose https://sqlite.org/src || die
+ echo
+ fi
+ cp -p sqlite.fossil "${distdir}/fossil-src/${PN}" || die
+ einfo fossil open --quiet sqlite.fossil
+ fossil open --quiet sqlite.fossil || die
+ echo
+ popd > /dev/null || die
+
+ if use doc; then
+ mkdir "${WORKDIR}/${PN}-doc" || die
+ pushd "${WORKDIR}/${PN}-doc" > /dev/null || die
+ if [[ ! -f "${distdir}/fossil-src/${PN}/sqlite-doc.fossil" ]]; then
+ einfo fossil clone --verbose https://sqlite.org/docsrc sqlite-doc.fossil
+ fossil clone --verbose https://sqlite.org/docsrc sqlite-doc.fossil || die
+ echo
+ else
+ cp -p "${distdir}/fossil-src/${PN}/sqlite-doc.fossil" . || die
+ einfo fossil pull --repository sqlite-doc.fossil --verbose https://sqlite.org/docsrc
+ fossil pull --repository sqlite-doc.fossil --verbose https://sqlite.org/docsrc || die
+ echo
+ fi
+ cp -p sqlite-doc.fossil "${distdir}/fossil-src/${PN}" || die
+ einfo fossil open --quiet sqlite-doc.fossil
+ fossil open --quiet sqlite-doc.fossil || die
+ echo
+ popd > /dev/null || die
+ fi
else
- S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
+ default
fi
}
src_prepare() {
if full_archive; then
- eapply "${FILESDIR}/${PN}-3.27.0-full_archive-build.patch"
- eapply "${FILESDIR}/${PN}-3.27.2-full_archive-tests.patch"
+ eapply "${FILESDIR}/${PN}-3.29.0-full_archive-build.patch"
+ eapply "${FILESDIR}/${PN}-3.29.0-full_archive-tests.patch"
eapply_user
@@ -85,7 +151,8 @@ src_prepare() {
}
multilib_src_configure() {
- local CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" options=()
+ local -x CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}"
+ local options=()
options+=(
--enable-$(full_archive && echo load-extension || echo dynamic-extensions)
@@ -314,12 +381,12 @@ multilib_src_install() {
}
multilib_src_install_all() {
- find "${D}" -name "*.la" -delete || die
+ find "${D}" -name "*.la" -type f -delete || die
doman sqlite3.1
if use doc; then
- rm "${WORKDIR}/${PN}-doc-${DOC_PV}/"*.{db,txt}
+ rm "${WORKDIR}/${PN}-doc-${DOC_PV}/"*.{db,txt} || die
(
docinto html
dodoc -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"*