diff options
Diffstat (limited to 'poky/meta/recipes-support/sqlite')
-rw-r--r-- | poky/meta/recipes-support/sqlite/files/CVE-2018-8740.patch | 47 | ||||
-rw-r--r-- | poky/meta/recipes-support/sqlite/sqlite3.inc | 8 | ||||
-rw-r--r-- | poky/meta/recipes-support/sqlite/sqlite3_3.23.1.bb (renamed from poky/meta/recipes-support/sqlite/sqlite3_3.22.0.bb) | 5 |
3 files changed, 4 insertions, 56 deletions
diff --git a/poky/meta/recipes-support/sqlite/files/CVE-2018-8740.patch b/poky/meta/recipes-support/sqlite/files/CVE-2018-8740.patch deleted file mode 100644 index 5d95e37af..000000000 --- a/poky/meta/recipes-support/sqlite/files/CVE-2018-8740.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 19aed4d2be46c4516caf2bee31f79044bbd1d57d Mon Sep 17 00:00:00 2001 -From: Sinan Kaya <okaya@kernel.org> -Date: Fri, 21 Sep 2018 16:22:01 +0000 -Subject: [PATCH] Detect databases whose schema is corrupted using a CREATE TABLE AS statement and issue an appropriate error message - -Upstream-Status: Backport [ https://www.sqlite.org/cgi/src/vdiff?from=1774f1c3baf0bc3d&to=d75e67654aa9620b&diff=1&w] -Signed-off-by: Sinan Kaya <okaya@kernel.org> ---- - sqlite3.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/sqlite3.c b/sqlite3.c -index 73c69ef..6863bc6 100644 ---- a/sqlite3.c -+++ b/sqlite3.c -@@ -103474,8 +103474,6 @@ SQLITE_PRIVATE void sqlite3EndTable( - p = pParse->pNewTable; - if( p==0 ) return; - -- assert( !db->init.busy || !pSelect ); -- - /* If the db->init.busy is 1 it means we are reading the SQL off the - ** "sqlite_master" or "sqlite_temp_master" table on the disk. - ** So do not write to the disk again. Extract the root page number -@@ -103486,6 +103484,10 @@ SQLITE_PRIVATE void sqlite3EndTable( - ** table itself. So mark it read-only. - */ - if( db->init.busy ){ -+ if( pSelect ){ -+ sqlite3ErrorMsg(pParse, ""); -+ return; -+ } - p->tnum = db->init.newTnum; - if( p->tnum==1 ) p->tabFlags |= TF_Readonly; - } -@@ -117813,7 +117815,7 @@ static void corruptSchema( - char *z; - if( zObj==0 ) zObj = "?"; - z = sqlite3MPrintf(db, "malformed database schema (%s)", zObj); -- if( zExtra ) z = sqlite3MPrintf(db, "%z - %s", z, zExtra); -+ if( zExtra && zExtra[0] ) z = sqlite3MPrintf(db, "%z - %s", z, zExtra); - sqlite3DbFree(db, *pData->pzErrMsg); - *pData->pzErrMsg = z; - } --- -2.19.0 - diff --git a/poky/meta/recipes-support/sqlite/sqlite3.inc b/poky/meta/recipes-support/sqlite/sqlite3.inc index 30847b958..1834867d1 100644 --- a/poky/meta/recipes-support/sqlite/sqlite3.inc +++ b/poky/meta/recipes-support/sqlite/sqlite3.inc @@ -36,14 +36,10 @@ EXTRA_OECONF = " \ CFLAGS_append = " -fPIC" # pread() is in POSIX.1-2001 so any reasonable system must surely support it -BUILD_CFLAGS += "-DUSE_PREAD" -BUILDSDK_CFLAGS += "-DUSE_PREAD" -TARGET_CFLAGS += "-DUSE_PREAD" +CFLAGS += "-DUSE_PREAD" # Provide column meta-data API -BUILD_CFLAGS += "-DSQLITE_ENABLE_COLUMN_METADATA" -BUILDSDK_CFLAGS += "-DSQLITE_ENABLE_COLUMN_METADATA" -TARGET_CFLAGS += "-DSQLITE_ENABLE_COLUMN_METADATA" +CFLAGS += "-DSQLITE_ENABLE_COLUMN_METADATA" PACKAGES = "lib${BPN} lib${BPN}-dev lib${BPN}-doc ${PN}-dbg lib${BPN}-staticdev ${PN}" diff --git a/poky/meta/recipes-support/sqlite/sqlite3_3.22.0.bb b/poky/meta/recipes-support/sqlite/sqlite3_3.23.1.bb index b90f89886..3755761d7 100644 --- a/poky/meta/recipes-support/sqlite/sqlite3_3.22.0.bb +++ b/poky/meta/recipes-support/sqlite/sqlite3_3.23.1.bb @@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed0 SRC_URI = "\ http://www.sqlite.org/2018/sqlite-autoconf-${SQLITE_PV}.tar.gz \ - file://CVE-2018-8740.patch \ " -SRC_URI[md5sum] = "96b5648d542e8afa6ab7ffb8db8ddc3d" -SRC_URI[sha256sum] = "2824ab1238b706bc66127320afbdffb096361130e23291f26928a027b885c612" +SRC_URI[md5sum] = "99a51b40a66872872a91c92f6d0134fa" +SRC_URI[sha256sum] = "92842b283e5e744eff5da29ed3c69391de7368fccc4d0ee6bf62490ce555ef25" |