Accepting request 811818 from server:database
OBS-URL: https://build.opensuse.org/request/show/811818 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sqlite3?expand=0&rev=119
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
8f2547bfcb
@ -1,25 +0,0 @@
|
|||||||
Index: src/insert.c
|
|
||||||
==================================================================
|
|
||||||
--- src/insert.c
|
|
||||||
+++ src/insert.c
|
|
||||||
@@ -2168,16 +2168,18 @@
|
|
||||||
** Hence, make a complete copy of the opcode, rather than using
|
|
||||||
** a pointer to the opcode. */
|
|
||||||
x = *sqlite3VdbeGetOp(v, addrConflictCk);
|
|
||||||
if( x.opcode!=OP_IdxRowid ){
|
|
||||||
int p2; /* New P2 value for copied conflict check opcode */
|
|
||||||
+ const char *zP4;
|
|
||||||
if( sqlite3OpcodeProperty[x.opcode]&OPFLG_JUMP ){
|
|
||||||
p2 = lblRecheckOk;
|
|
||||||
}else{
|
|
||||||
p2 = x.p2;
|
|
||||||
}
|
|
||||||
- sqlite3VdbeAddOp4(v, x.opcode, x.p1, p2, x.p3, x.p4.z, x.p4type);
|
|
||||||
+ zP4 = x.p4type==P4_INT32 ? SQLITE_INT_TO_PTR(x.p4.i) : x.p4.z;
|
|
||||||
+ sqlite3VdbeAddOp4(v, x.opcode, x.p1, p2, x.p3, zP4, x.p4type);
|
|
||||||
sqlite3VdbeChangeP5(v, x.p5);
|
|
||||||
VdbeCoverageIf(v, p2!=x.p2);
|
|
||||||
}
|
|
||||||
nConflictCk--;
|
|
||||||
addrConflictCk++;
|
|
||||||
|
|
||||||
@ -1,65 +0,0 @@
|
|||||||
Index: ext/fts5/test/fts5matchinfo.test
|
|
||||||
==================================================================
|
|
||||||
--- ext/fts5/test/fts5matchinfo.test
|
|
||||||
+++ ext/fts5/test/fts5matchinfo.test
|
|
||||||
@@ -498,23 +498,26 @@
|
|
||||||
CREATE VIRTUAL TABLE t1 USING fts5(x, y);
|
|
||||||
INSERT INTO t1 VALUES('a', 'b');
|
|
||||||
INSERT INTO t1 VALUES('c', 'd');
|
|
||||||
}
|
|
||||||
|
|
||||||
+if {$tcl_platform(byteOrder)=="littleEndian"} {
|
|
||||||
+ set res {X'02000000'}
|
|
||||||
+} else {
|
|
||||||
+ set res {X'00000002'}
|
|
||||||
+}
|
|
||||||
do_execsql_test 15.1 {
|
|
||||||
SELECT quote(matchinfo(t1, 'n')) FROM t1 LIMIT 1;
|
|
||||||
-} {X'02000000'}
|
|
||||||
-
|
|
||||||
+} $res
|
|
||||||
do_execsql_test 15.2 {
|
|
||||||
DELETE FROM t1_content WHERE rowid=1;
|
|
||||||
SELECT quote(matchinfo(t1, 'n')) FROM t1 LIMIT 1;
|
|
||||||
-} {X'02000000'}
|
|
||||||
+} $res
|
|
||||||
|
|
||||||
fts5_aux_test_functions db
|
|
||||||
do_execsql_test 15.3 {
|
|
||||||
SELECT fts5_test_all(t1) FROM t1 LIMIT 1;
|
|
||||||
} {
|
|
||||||
{columnsize {0 0} columntext {c d} columntotalsize {2 2} poslist {} tokenize {c d} rowcount 2}
|
|
||||||
}
|
|
||||||
|
|
||||||
finish_test
|
|
||||||
-
|
|
||||||
|
|
||||||
Index: test/fts4aa.test
|
|
||||||
==================================================================
|
|
||||||
--- test/fts4aa.test
|
|
||||||
+++ test/fts4aa.test
|
|
||||||
@@ -227,17 +227,22 @@
|
|
||||||
} {1 {database disk image is malformed}}
|
|
||||||
|
|
||||||
# 2019-11-18 https://bugs.chromium.org/p/chromium/issues/detail?id=1025467
|
|
||||||
db close
|
|
||||||
sqlite3 db :memory:
|
|
||||||
+if {$tcl_platform(byteOrder)=="littleEndian"} {
|
|
||||||
+ set res {X'0200000000000000000000000E0000000E00000001000000010000000100000001000000'}
|
|
||||||
+} else {
|
|
||||||
+ set res {X'0000000200000000000000000000000E0000000E00000001000000010000000100000001'}
|
|
||||||
+}
|
|
||||||
do_execsql_test fts4aa-6.10 {
|
|
||||||
CREATE VIRTUAL TABLE f USING fts4();
|
|
||||||
INSERT INTO f_segdir VALUES (77,91,0,0,'255 77',x'0001308000004d5c4ddddddd4d4d7b4d4d4d614d8019ff4d05000001204d4d2e4d6e4d4d4d4b4d6c4d004d4d4d4d4d4d3d000000004d5d4d4d645d4d004d4d4d4d4d4d4d4d4d454d6910004d05ffff054d646c4d004d5d4d4d4d4d3d000000004d4d4d4d4d4d4d4d4d4d4d69624d4d4d04004d4d4d4d4d604d4ce1404d554d45');
|
|
||||||
INSERT INTO f_segdir VALUES (77,108,0,0,'255 77',x'0001310000fa64004d4d4d3c5d4d654d4d4d614d8000ff4d05000001204d4d2e4d6e4d4d4dff4d4d4d4d4d4d00104d4d4d4d000000004d4d4d0400311d4d4d4d4d4d4d4d4d4d684d6910004d05ffff054d4d6c4d004d4d4d4d4d4d3d000000004d4d4d4d644d4d4d4d4d4d69624d4d4d03ed4d4d4d4d4d604d4ce1404d550080');
|
|
||||||
INSERT INTO f_stat VALUES (0,x'80808080100000000064004d4d4d3c4d4d654d4d4d614d8000ff4df6ff1a00204d4d2e4d6e4d4d4d104d4d4d4d4d4d00104d4d4d4d4d4d69574d4d4d000031044d4d4d3e4d4d4c4d05004d6910');
|
|
||||||
SELECT quote(matchinfo(f,'pnax')) from f where f match '0 1';
|
|
||||||
-} {X'0200000000000000000000000E0000000E00000001000000010000000100000001000000'}
|
|
||||||
+} $res
|
|
||||||
|
|
||||||
# 2019-11-18 Detect infinite loop in fts3SelectLeaf()
|
|
||||||
db close
|
|
||||||
sqlite3 db :memory:
|
|
||||||
do_catchsql_test fts4aa-7.10 {
|
|
||||||
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:eb669d0044ca605817919de48cf54592aa15afafa4af42246649dec54940271b
|
|
||||||
size 9600405
|
|
||||||
3
sqlite-doc-3320200.zip
Normal file
3
sqlite-doc-3320200.zip
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:4355a8e835b1b67e6d555ee383c904aab6912b3298f3ee7380246a3428760701
|
||||||
|
size 9766769
|
||||||
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:f2dc2382855d99a960c363c1e5ae72b49da4c55d49154aa6d100e5970a1fee58
|
|
||||||
size 12510166
|
|
||||||
3
sqlite-src-3320200.zip
Normal file
3
sqlite-src-3320200.zip
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:e027dd65738eb03fa87d79075a0ec2db2d2c7ad8ebca9ad2a0e96e6612d210cb
|
||||||
|
size 12525765
|
||||||
@ -1,3 +1,38 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jun 5 12:57:51 UTC 2020 - Paolo Stivanin <info@paolostivanin.com>
|
||||||
|
|
||||||
|
- SQLite 3.32.2:
|
||||||
|
* Fix a long-standing bug in the byte-code engine that can cause
|
||||||
|
a COMMIT command report as success when in fact it failed to commit
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue May 26 09:15:39 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>
|
||||||
|
|
||||||
|
- SQLite 3.32.1:
|
||||||
|
* CVE-2020-13435: Malicious SQL statements could have crashed the
|
||||||
|
process that is running SQLite (boo#1172091)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun May 24 06:03:29 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>
|
||||||
|
|
||||||
|
- SQLite 3.32.0:
|
||||||
|
* Add support for approximate ANALYZE using the PRAGMA
|
||||||
|
analysis_limit command
|
||||||
|
* Add the bytecode virtual table
|
||||||
|
* Add the checksum VFS shim to the set of run-time loadable
|
||||||
|
extensions included in the source tree
|
||||||
|
* Add the iif() SQL function.
|
||||||
|
* INSERT and UPDATE statements now always apply column affinity
|
||||||
|
before computing CHECK constraints
|
||||||
|
* Increase the default upper bound on the number of parameters
|
||||||
|
from 999 to 32766
|
||||||
|
* Add code for the UINT collating sequence as an optional
|
||||||
|
loadable extension
|
||||||
|
* multiple enhancements to the CLI
|
||||||
|
- drop upstreamed patches:
|
||||||
|
* 04885763c4cd00cb-s390-compatibility.patch
|
||||||
|
* b20503aaf5b6595a-adapt-FTS-tests-for-big-endian.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Jan 29 12:59:23 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
Wed Jan 29 12:59:23 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
||||||
|
|
||||||
|
|||||||
10
sqlite3.spec
10
sqlite3.spec
@ -18,9 +18,9 @@
|
|||||||
|
|
||||||
%bcond_with icu
|
%bcond_with icu
|
||||||
%define oname sqlite
|
%define oname sqlite
|
||||||
%define tarversion 3310100
|
%define tarversion 3320200
|
||||||
Name: sqlite3
|
Name: sqlite3
|
||||||
Version: 3.31.1
|
Version: 3.32.2
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Embeddable SQL Database Engine
|
Summary: Embeddable SQL Database Engine
|
||||||
License: SUSE-Public-Domain
|
License: SUSE-Public-Domain
|
||||||
@ -29,10 +29,6 @@ URL: http://www.sqlite.org/
|
|||||||
Source0: http://www.sqlite.org/2020/sqlite-src-%{tarversion}.zip
|
Source0: http://www.sqlite.org/2020/sqlite-src-%{tarversion}.zip
|
||||||
Source1: baselibs.conf
|
Source1: baselibs.conf
|
||||||
Source2: http://www.sqlite.org/2020/sqlite-doc-%{tarversion}.zip
|
Source2: http://www.sqlite.org/2020/sqlite-doc-%{tarversion}.zip
|
||||||
# PATCH-FIX-UPSTREAM -- Fix errors on s390
|
|
||||||
Patch0: 04885763c4cd00cb-s390-compatibility.patch
|
|
||||||
# PATCH-FIX-UPSTREAM -- Fix FTS test failures on big endian archs
|
|
||||||
Patch1: b20503aaf5b6595a-adapt-FTS-tests-for-big-endian.patch
|
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
%if %{with icu}
|
%if %{with icu}
|
||||||
BuildRequires: libicu-devel
|
BuildRequires: libicu-devel
|
||||||
@ -111,8 +107,6 @@ other documentation found on sqlite.org. The files can be found in
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n sqlite-src-%{tarversion} -a2
|
%setup -q -n sqlite-src-%{tarversion} -a2
|
||||||
%patch0 -p0
|
|
||||||
%patch1 -p0
|
|
||||||
|
|
||||||
rm -v sqlite-doc-%{tarversion}/releaselog/current.html
|
rm -v sqlite-doc-%{tarversion}/releaselog/current.html
|
||||||
ln -sv `echo %{version} | sed "s/\./_/g"`.html sqlite-doc-%{tarversion}/releaselog/current.html
|
ln -sv `echo %{version} | sed "s/\./_/g"`.html sqlite-doc-%{tarversion}/releaselog/current.html
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user