sqlite: update to 3.32.1.
This commit is contained in:
parent
6de041d733
commit
a791f2794a
2 changed files with 3 additions and 38 deletions
|
@ -1,35 +0,0 @@
|
|||
From 90b1adc1f130148a11e1ae11a154edc67bc521f6 Mon Sep 17 00:00:00 2001
|
||||
From: q66 <daniel@octaforge.org>
|
||||
Date: Sun, 9 Feb 2020 16:47:57 +0100
|
||||
Subject: [PATCH] Fix segfault on some platforms
|
||||
|
||||
This can be reproduced on e.g. firefox with ppc64 after updating
|
||||
sqlite from 3.30.1. This is a cherry-pick of an upstream revision
|
||||
that fixes the problem (https://sqlite.org/src/info/04885763c4cd00cb).
|
||||
---
|
||||
sqlite3.c | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git sqlite3.c sqlite3.c
|
||||
index 55dc686..0fb0b55 100644
|
||||
--- sqlite3.c
|
||||
+++ sqlite3.c
|
||||
@@ -121302,12 +121302,14 @@ SQLITE_PRIVATE void sqlite3GenerateConstraintChecks(
|
||||
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);
|
||||
}
|
||||
--
|
||||
2.24.0
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'sqlite'
|
||||
pkgname=sqlite
|
||||
version=3.31.1
|
||||
revision=3
|
||||
version=3.32.1
|
||||
revision=1
|
||||
_amalgamationver=$(printf "%d%02d%02d00\n" ${version//./ })
|
||||
wrksrc="sqlite-autoconf-${_amalgamationver}"
|
||||
build_style=gnu-configure
|
||||
|
@ -13,7 +13,7 @@ license="Public Domain"
|
|||
homepage="https://sqlite.org/"
|
||||
changelog="https://www.sqlite.org/releaselog/${version//./_}.html"
|
||||
distfiles="${homepage}/2020/sqlite-autoconf-${_amalgamationver}.tar.gz"
|
||||
checksum=62284efebc05a76f909c580ffa5c008a7d22a1287285d68b7825a2b6b51949ae
|
||||
checksum=486748abfb16abd8af664e3a5f03b228e5f124682b0c942e157644bf6fff7d10
|
||||
|
||||
CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
|
||||
-DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_JSON1 \
|
||||
|
|
Loading…
Reference in a new issue