mirrors/buildroot
0
0
Fork 0
mirror of https://git.busybox.net/buildroot.git synced 2024-11-23 21:43:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

sqlite: bump to version 3.21.0

Browse Source 
Drop upstream patches.

Add license file hash.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Baruch Siach 2017-10-31 14:17:52 +02:00 committed by Peter Korsgaard
parent 99a8cc1bef
commit b44c395c0d
4 changed files with 5 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
package/sqlite/0001-CVE-2017-13685.patch
View File

@ -1,54 +0,0 @@
Fix CVE-2017-13685
The dump_callback function in SQLite 3.20.0 allows remote attackers to cause a
denial of service (EXC_BAD_ACCESS and application crash) via a crafted file.
Patch taken from Debian:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=873762
Upstream issue: https://sqlite.org/src/info/02f0f4c54f2819b3
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Index: src/shell.c
==================================================================
--- src/shell.c
+++ src/shell.c
@@ -2657,10 +2657,11 @@
int *aiType /* Column types */
){
int i;
ShellState *p = (ShellState*)pArg;
+ if( azArg==0 ) return 0;
switch( p->cMode ){
case MODE_Line: {
int w = 5;
if( azArg==0 ) break;
for(i=0; i<nArg; i++){
@@ -3007,10 +3008,11 @@
*/
static int captureOutputCallback(void *pArg, int nArg, char **azArg, char **az){
ShellText *p = (ShellText*)pArg;
int i;
UNUSED_PARAMETER(az);
+ if( azArg==0 ) return 0;
if( p->n ) appendText(p, "|", 0);
for(i=0; i<nArg; i++){
if( i ) appendText(p, ",", 0);
if( azArg[i] ) appendText(p, azArg[i], 0);
}
@@ -3888,11 +3890,11 @@
const char *zType;
const char *zSql;
ShellState *p = (ShellState *)pArg;
UNUSED_PARAMETER(azNotUsed);
- if( nArg!=3 ) return 1;
+ if( nArg!=3 || azArg==0 ) return 0;
zTable = azArg[0];
zType = azArg[1];
zSql = azArg[2];
if( strcmp(zTable, "sqlite_sequence")==0 ){

28
package/sqlite/0002-CVE-2017-15286.patch
View File

@ -1,28 +0,0 @@
Fix CVE-2017-15286
SQLite 3.20.1 has a NULL pointer dereference in tableColumnList in shell.c
because it fails to consider certain cases where
`sqlite3_step(pStmt)==SQLITE_ROW` is false and a data structure is never
initialized.
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=878680
Upstream commit: http://www.sqlite.org/src/info/5d0ceb8dcdef92cd
Index: src/shell.c
==================================================================
--- src/shell.c
+++ src/shell.c
@@ -3807,10 +3807,11 @@
isIPK = 0;
}
}
}
sqlite3_finalize(pStmt);
+ if( azCol==0 ) return 0;
azCol[0] = 0;
azCol[nCol+1] = 0;
/* The decision of whether or not a rowid really needs to be preserved
** is tricky. We never need to preserve a rowid for a WITHOUT ROWID table

6
package/sqlite/sqlite.hash
View File

@ -1,4 +1,6 @@
# From http://www.sqlite.org/download.html
sha1 48593dcd19473f25fe6fcd08048e13ddbff4c983 sqlite-autoconf-3200100.tar.gz
sha1 f56fe3407d8297fc0a68a058f4c9e6b77e83575c sqlite-autoconf-3210000.tar.gz
# Calculated based on the hash above
sha256 ec66595b29bc0798b023a5122021ea646ab4fa9e2f735937c5426feeba950742 sqlite-autoconf-3200100.tar.gz
sha256 d7dd516775005ad87a57f428b6f86afd206cb341722927f104d3f0cf65fbbbe3 sqlite-autoconf-3210000.tar.gz
# Locally calculated
sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms

2
package/sqlite/sqlite.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
SQLITE_VERSION = 3200100
SQLITE_VERSION = 3210000
SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz
SQLITE_SITE = http://www.sqlite.org/2017
SQLITE_LICENSE = Public domain