From 549c5046deaa72ffd09f10d07178e8a74987a699 Mon Sep 17 00:00:00 2001 From: wangmy Date: Tue, 1 Mar 2022 21:07:53 +0800 Subject: sqlite3: upgrade 3.37.2 -> 3.38.0 Remove invalid PACKAGECONFIG : json1 (From OE-Core rev: 3f665656e3c0134994015235c24240086d5324fc) Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-support/sqlite/sqlite3.inc | 5 ++--- meta/recipes-support/sqlite/sqlite3_3.37.2.bb | 14 -------------- meta/recipes-support/sqlite/sqlite3_3.38.0.bb | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 17 deletions(-) delete mode 100644 meta/recipes-support/sqlite/sqlite3_3.37.2.bb create mode 100644 meta/recipes-support/sqlite/sqlite3_3.38.0.bb diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc index aa5dc0974b..9a0de08553 100644 --- a/meta/recipes-support/sqlite/sqlite3.inc +++ b/meta/recipes-support/sqlite/sqlite3.inc @@ -23,15 +23,14 @@ CVE_PRODUCT = "sqlite" inherit autotools pkgconfig siteinfo # enable those which are enabled by default in configure -PACKAGECONFIG ?= "fts4 fts5 json1 rtree dyn_ext" -PACKAGECONFIG:class-native ?= "fts4 fts5 json1 rtree dyn_ext" +PACKAGECONFIG ?= "fts4 fts5 rtree dyn_ext" +PACKAGECONFIG:class-native ?= "fts4 fts5 rtree dyn_ext" PACKAGECONFIG[editline] = "--enable-editline,--disable-editline,libedit" PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline ncurses" PACKAGECONFIG[fts3] = "--enable-fts3,--disable-fts3" PACKAGECONFIG[fts4] = "--enable-fts4,--disable-fts4" PACKAGECONFIG[fts5] = "--enable-fts5,--disable-fts5" -PACKAGECONFIG[json1] = "--enable-json1,--disable-json1" PACKAGECONFIG[rtree] = "--enable-rtree,--disable-rtree" PACKAGECONFIG[session] = "--enable-session,--disable-session" PACKAGECONFIG[dyn_ext] = "--enable-dynamic-extensions,--disable-dynamic-extensions" diff --git a/meta/recipes-support/sqlite/sqlite3_3.37.2.bb b/meta/recipes-support/sqlite/sqlite3_3.37.2.bb deleted file mode 100644 index eb684e0d14..0000000000 --- a/meta/recipes-support/sqlite/sqlite3_3.37.2.bb +++ /dev/null @@ -1,14 +0,0 @@ -require sqlite3.inc - -LICENSE = "PD" -LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66" - -SRC_URI = "http://www.sqlite.org/2022/sqlite-autoconf-${SQLITE_PV}.tar.gz" -SRC_URI[sha256sum] = "4089a8d9b467537b3f246f217b84cd76e00b1d1a971fe5aca1e30e230e46b2d8" - -# -19242 is only an issue in specific development branch commits -CVE_CHECK_IGNORE += "CVE-2019-19242" -# This is believed to be iOS specific (https://groups.google.com/g/sqlite-dev/c/U7OjAbZO6LA) -CVE_CHECK_IGNORE += "CVE-2015-3717" -# Issue in an experimental extension we don't have/use. Fixed by https://sqlite.org/src/info/b1e0c22ec981cf5f -CVE_CHECK_IGNORE += "CVE-2021-36690" diff --git a/meta/recipes-support/sqlite/sqlite3_3.38.0.bb b/meta/recipes-support/sqlite/sqlite3_3.38.0.bb new file mode 100644 index 0000000000..a797679f12 --- /dev/null +++ b/meta/recipes-support/sqlite/sqlite3_3.38.0.bb @@ -0,0 +1,14 @@ +require sqlite3.inc + +LICENSE = "PD" +LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66" + +SRC_URI = "http://www.sqlite.org/2022/sqlite-autoconf-${SQLITE_PV}.tar.gz" +SRC_URI[sha256sum] = "1c76e25dc63d9f3935e0f406aec520a33ee77cf54ea5147dffe1fae8369eff68" + +# -19242 is only an issue in specific development branch commits +CVE_CHECK_IGNORE += "CVE-2019-19242" +# This is believed to be iOS specific (https://groups.google.com/g/sqlite-dev/c/U7OjAbZO6LA) +CVE_CHECK_IGNORE += "CVE-2015-3717" +# Issue in an experimental extension we don't have/use. Fixed by https://sqlite.org/src/info/b1e0c22ec981cf5f +CVE_CHECK_IGNORE += "CVE-2021-36690" -- cgit v1.2.3-54-g00ecf