From b5ba70b47fff227e4381fcac93defccb79e3d8f1 Mon Sep 17 00:00:00 2001 From: Roy Li Date: Tue, 19 May 2015 20:32:01 +0800 Subject: sqlite3: upgrade to 3.8.10 upgrade to include CVE fixes: CVE-2015-3414 CVE-2015-3415 CVE-2015-3416 (From OE-Core rev: 346505144a18b738846b9d5bc6f146426d3572ba) Signed-off-by: Roy Li Signed-off-by: Richard Purdie --- .../files/0001-using-the-dynamic-library.patch | 30 ++++++++++++++++++++++ meta/recipes-support/sqlite/sqlite3_3.8.10.0.bb | 23 +++++++++++++++++ meta/recipes-support/sqlite/sqlite3_3.8.7.4.bb | 21 --------------- 3 files changed, 53 insertions(+), 21 deletions(-) create mode 100644 meta/recipes-support/sqlite/files/0001-using-the-dynamic-library.patch create mode 100644 meta/recipes-support/sqlite/sqlite3_3.8.10.0.bb delete mode 100644 meta/recipes-support/sqlite/sqlite3_3.8.7.4.bb (limited to 'meta/recipes-support') diff --git a/meta/recipes-support/sqlite/files/0001-using-the-dynamic-library.patch b/meta/recipes-support/sqlite/files/0001-using-the-dynamic-library.patch new file mode 100644 index 0000000000..e3bfd5f656 --- /dev/null +++ b/meta/recipes-support/sqlite/files/0001-using-the-dynamic-library.patch @@ -0,0 +1,30 @@ +[PATCH] using the dynamic library + +Upstream-Status: Inappropriate [configuration] + +building statically-linked sqlite3 failed since sqlite3.o is generated in +different dir, even if link successes, the size of sqlite3 is become larger, +so use the dynamic link, ref: http://patchwork.openembedded.org/patch/93293/ + +Signed-off-by: Roy Li +--- + Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 88bc23d..fe50f20 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -7,7 +7,8 @@ libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8 + + bin_PROGRAMS = sqlite3 + sqlite3_SOURCES = shell.c sqlite3.h +-sqlite3_LDADD = sqlite3.$(OBJEXT) @READLINE_LIBS@ ++sqlite3_LDADD = @READLINE_LIBS@ libsqlite3.la ++ + + include_HEADERS = sqlite3.h sqlite3ext.h + +-- +1.9.1 + diff --git a/meta/recipes-support/sqlite/sqlite3_3.8.10.0.bb b/meta/recipes-support/sqlite/sqlite3_3.8.10.0.bb new file mode 100644 index 0000000000..d7f72d9abc --- /dev/null +++ b/meta/recipes-support/sqlite/sqlite3_3.8.10.0.bb @@ -0,0 +1,23 @@ +require sqlite3.inc + +LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=65f0a57ca6928710b418c094b3570bb0" + +def sqlite_download_version(d): + pvsplit = d.getVar('PV', True).split('.') + return pvsplit[0] + ''.join([part.rjust(2,'0') for part in pvsplit[1:]]) + +PE = "3" +SQLITE_PV = "${@sqlite_download_version(d)}" +SRC_URI = "http://www.sqlite.org/2015/sqlite-autoconf-${SQLITE_PV}.tar.gz \ + file://0001-using-the-dynamic-library.patch \ +" + +SRC_URI[md5sum] = "04d0311ef70818e8d914c1dc383eddff" +SRC_URI[sha256sum] = "c4b8f9eefbdf0b9bef2044bdc3510c8a3f3b0ddb0489661fb433034187f5a428" + +S = "${WORKDIR}/sqlite-autoconf-${SQLITE_PV}" + +# Provide column meta-data API +BUILD_CFLAGS += "-DSQLITE_ENABLE_COLUMN_METADATA" +TARGET_CFLAGS += "-DSQLITE_ENABLE_COLUMN_METADATA" + diff --git a/meta/recipes-support/sqlite/sqlite3_3.8.7.4.bb b/meta/recipes-support/sqlite/sqlite3_3.8.7.4.bb deleted file mode 100644 index 4c73d304da..0000000000 --- a/meta/recipes-support/sqlite/sqlite3_3.8.7.4.bb +++ /dev/null @@ -1,21 +0,0 @@ -require sqlite3.inc - -LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=65f0a57ca6928710b418c094b3570bb0" - -def sqlite_download_version(d): - pvsplit = d.getVar('PV', True).split('.') - return pvsplit[0] + ''.join([part.rjust(2,'0') for part in pvsplit[1:]]) - -PE = "3" -SQLITE_PV = "${@sqlite_download_version(d)}" -SRC_URI = "http://www.sqlite.org/2014/sqlite-autoconf-${SQLITE_PV}.tar.gz" - -SRC_URI[md5sum] = "33bb8db0038317ce1b0480ca1185c7ba" -SRC_URI[sha256sum] = "86370f139405fdfe03334fd618171a74e50f589f17ccbe5933361ed1f58359ec" - -S = "${WORKDIR}/sqlite-autoconf-${SQLITE_PV}" - -# Provide column meta-data API -BUILD_CFLAGS += "-DSQLITE_ENABLE_COLUMN_METADATA" -TARGET_CFLAGS += "-DSQLITE_ENABLE_COLUMN_METADATA" - -- cgit v1.2.3-54-g00ecf